diff --git a/Localization/ar/OrchardCore.Admin.po b/Localization/ar/OrchardCore.Admin.po
index 4f7553cbb2da3..5589638465ea7 100644
--- a/Localization/ar/OrchardCore.Admin.po
+++ b/Localization/ar/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "المدير"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "إعدادات المدير"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "تصدير إعدادات المدير."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "مرحباً بكم في Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "لا تتردد في تصفح القائمة و إستكشاف جميع إمكانياتها."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "تفعيل الوضع المظلم"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "ما إذا كان يمكن عرض الوضع المظلم في قالب المدير."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "إذا تم عرض العناوين في الشريط العلوي."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "المدير"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/ar/OrchardCore.AdminDashboard.po b/Localization/ar/OrchardCore.AdminDashboard.po
index 88466951cdf77..94915d718d3a3 100644
--- a/Localization/ar/OrchardCore.AdminDashboard.po
+++ b/Localization/ar/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "لا"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "الموقع"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "العرض"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/ar/OrchardCore.AdminMenu.po b/Localization/ar/OrchardCore.AdminMenu.po
index 7c1d368e4d60b..d146ab6775945 100644
--- a/Localization/ar/OrchardCore.AdminMenu.po
+++ b/Localization/ar/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:20\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "إنشاء قائمة المدير {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "الإسم"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "إنشاء عفدة"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "تحرير قائمة المدير: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "الإسم"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "تحرير عقدة"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "أولوية هذا الرابط ليتم عرضه كنشط بدلاً من أي رابط أخر يشير إلى نفس العنوان. الرابط مع أعلى قيمة له حالة نشطة في التنقل."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "موقع هذا الرابط في قائمة المدير."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "رابط تشعبي"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "نص الرابط الذي سيظهر على الشجرة."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "عنوان الرابط. الرابط سيظهر في حال إذا كان الرابط أو أحد ابناءه يمتلك عنوان. العنوان سيكون نسبي إلى جذر موقع المدير"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "اختر أيقونة"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -579,7 +579,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "النص البديل"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -591,7 +591,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "نص عنصر القائمة كما سيظهر في الشجرة."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -604,49 +604,49 @@ msgid "Pick"
 msgstr "اختر"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "اختر أيقونة لعرضها عندما يكون عنصر القائمه في المستوى الأول."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "اختر أيقونة"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "الأذونات"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "أكتب للبحث"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "أختر"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "إزالة"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "لا توجد نتائج"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "الأذونات المطلوبة لعرض عنصر القائمة (اختياري)."
diff --git a/Localization/ar/OrchardCore.Alias.po b/Localization/ar/OrchardCore.Alias.po
index 86c7d852ca04f..6b9b326672fae 100644
--- a/Localization/ar/OrchardCore.Alias.po
+++ b/Localization/ar/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "الاسم المستعار الخاص بك قيد الاستخدام مسبقاً \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "النمط لا يحتوي على عبارة Liquid صحيحة. للتفاصيل: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "اتركه فارغاً لإعادة توليده."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "الاسم البديل مولد آلياً والإدخال معطَّل"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ar/OrchardCore.ArchiveLater.po b/Localization/ar/OrchardCore.ArchiveLater.po
index 62904694e4b08..125359c5bef17 100644
--- a/Localization/ar/OrchardCore.ArchiveLater.po
+++ b/Localization/ar/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "أرشيف لاحقاً"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "إلغاء الأرشيف لاحقاً"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ar/OrchardCore.AuditTrail.po b/Localization/ar/OrchardCore.AuditTrail.po
index 69753c2a8b0ef..68f382bee74a6 100644
--- a/Localization/ar/OrchardCore.AuditTrail.po
+++ b/Localization/ar/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -585,7 +585,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -639,7 +639,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -651,7 +651,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/ar/OrchardCore.Autoroute.po b/Localization/ar/OrchardCore.Autoroute.po
index 0d6a5fa641e22..1562e41d23eda 100644
--- a/Localization/ar/OrchardCore.Autoroute.po
+++ b/Localization/ar/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ar/OrchardCore.BackgroundTasks.po b/Localization/ar/OrchardCore.BackgroundTasks.po
index 15dbff28c5931..c46a90c60a583 100644
--- a/Localization/ar/OrchardCore.BackgroundTasks.po
+++ b/Localization/ar/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-22 07:32\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/ar/OrchardCore.ContentFields.po b/Localization/ar/OrchardCore.ContentFields.po
index 941d6741771dd..77b2a1c921836 100644
--- a/Localization/ar/OrchardCore.ContentFields.po
+++ b/Localization/ar/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "تغيير"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "أساسي"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميحة نصية تظهر عند عرض هذا الحقل في المحرر."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "لا توجد عناصر للمحتوى."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "قياسي"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "غير منشور"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "أكتب هنا للبحث"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "أختر"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "لا توجد نتائج"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "حتى يتم السماح بإختيار عناصر متعددة."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "عرض كل أنواع المحتوي"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "أنواع المحتوى التي ستعرض. أختر واحد منها على الأقل."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميحة نصية تظهر عند عرض هذا الحقل في المحرر."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "مترجم"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "ما إذا كانت القيمة إلزامية."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميحة نصية تظهر عند عرض هذا الحقل في المحرر."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "ما إذا كانت القيمة إلزامية."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "محرر WYSIWYG"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "أساسي"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "توثيق الخيارات"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "عنوان موقع URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "رابط نصي"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "ما إذا كان الرابط إلزامي."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "استخدم URL كقيمة للرابط"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "تلميحة نصية تظهر عند عرض حقل عنوان موقع URL في المحرر."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "تلميحة نصية تظهر عند عرض نص حقل الرابط في المحرر."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "نص افتراضي يظهر كتلميحة عند خلو حقل عنوان موقع URL."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "نص افتراضي يظهر كتلميحة عند خلو الحقل النصي."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "قيمة عنوان موقع URL صحيحة تقترح عند إنشاء عنصر محتوى."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "لا توجد عناصر للمحتوى."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "قياسي"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "غير منشور"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "أكتب للبحث"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "إختيار"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "لا توجد نتائج"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "ما إذا يسمح باختيار عناصر متعددة."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "أنواع المحتوى التي ستعرض. أختر واحد منها على الأقل."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "مدى رقمي"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "لا شيء"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "حقل بمتحكم زيادة ونقصان"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "ما إذا كانت القيمة إلزامية."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميحة نصية تظهر لهذا الحقل في المحرر."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "تلميح يظهر عند خلو هذا الحقل. (اختياري)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "عدد الخانات الرقمية بعد الفاصلة العشرية."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "القيمة الأدنى المسموح بها. (اختياري)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "القيمة الأعلى المسموح بها. (اختياري)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "عنوان موقع URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "أساسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "أساسي"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "تروسية نصية 6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "حرر البيانات"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "تمثيل القيم المسموح بها بصيغة JSON، على سبيل المثال {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "ما إذا كانت القيمة إلزامية."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميحة نصية تظهر عند عرض هذا الحقل في المحرر."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "ما إذا كانت القيمة إلزامية."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "إلزامي"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "ما إذا كانت القيمة إلزامية."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "تلميح"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميحة نصية تظهر عند عرض هذا الحقل في المحرر."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "العرض"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "مقاس العرض لصندوق الفيديو"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "الارتفاع"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "مقاس الارتفاع لصندوق الفيديو"
diff --git a/Localization/ar/OrchardCore.ContentLocalization.po b/Localization/ar/OrchardCore.ContentLocalization.po
index d4d448cf5daae..352399eb82ba5 100644
--- a/Localization/ar/OrchardCore.ContentLocalization.po
+++ b/Localization/ar/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/ar/OrchardCore.ContentPreview.po b/Localization/ar/OrchardCore.ContentPreview.po
index 8249210acfec9..1211c81fac61f 100644
--- a/Localization/ar/OrchardCore.ContentPreview.po
+++ b/Localization/ar/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "النمط لا يحتوي على عبارة Liquid صحيحة. للتفاصيل: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "معاينة"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "المعاينة مقطوعة"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "خطأ المعاينة"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ar/OrchardCore.ContentTypes.po b/Localization/ar/OrchardCore.ContentTypes.po
index 87382e818ccd4..e890a33e50675 100644
--- a/Localization/ar/OrchardCore.ContentTypes.po
+++ b/Localization/ar/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "أجزاء المحتوى"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "الاسم الظاهر لا يمكن أن يكون فارغاً."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "النوع بنفس الإسم الظاهر موجود مسبقاً."
@@ -66,10 +66,10 @@ msgstr "النوع بنفس الإسم الظاهر موجود مسبقاً."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "الاسم التقني لا يمكن أن يكون فارغاً."
@@ -78,10 +78,10 @@ msgstr "الاسم التقني لا يمكن أن يكون فارغاً."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "الإسم التقني يجب أن يبدأ بحرف."
@@ -90,10 +90,10 @@ msgstr "الإسم التقني يجب أن يبدأ بحرف."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "الإسم التقني يحتوي على حروف غير صحيحة."
@@ -101,133 +101,133 @@ msgstr "الإسم التقني يحتوي على حروف غير صحيحة."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "الإسم التقني محجوز للاستخدام الداخلي."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "النوع بنفس الإسم التقني موجود مسبقاً."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "تم إنشاء نوع المحتوى \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "إعدادات \"{0}\" تم حفظها."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "تم حذف \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "تم إضافة الجزء \"{0}\"."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "جزء من الإسم الظاهر موجود مسبقاً."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "جزء من الإسم التقني موجود مسبقاً."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "تم حذف الجزء \"{0}\"."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "تعذر انشاء جزء المحتوى."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "تم إنشاء جزء المحتوى \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "تمّ تسجيل إعدادات \"{0}\"."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "الحقل بنفس الاسم الظاهر موجود مسبقاً."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "الحقل بنفس الإسم التقني موجود مسبقاً."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "تم إضافة الحقل \"{0}\"."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "تمّ تغيير اسم العرض الى {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "تمّ تسجيل بيانات الحقل \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "تمّ حذف الحقل \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "تمّ تسجيل بيانات الجزء \"{0}\"."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "لا يمكن لاسم نوع المحتوى أن يكون فارغاً."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "لا يمكن إظافة الجزء '{0}' لأنّه موجوه بالفعل."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "إضافة حقل جديد إلى \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "اسم الحقل كما سيتم عرضه على الشاشات."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "أضف جزءاً مسمى إلى \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "اسم الحقل كما سيتم عرضه في الشاشات."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "الاسم التقني للجزء القابل لإعادة الاستخدام."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "تصدير التعريفات المحددة من أنواع وأجزاء المحتوى."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "الإسم التقني للجزء."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "اسم الجزء كما سيتم عرضه في الشاشات. يمكن تركه فارغاً لاستخدام الإعدادات الافتراضية."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "السماح بإرفاق هذا الجزء عدة مرات."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "الإسم التقني للنوع."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "اسم النوع كما سيظهر على الشاشات."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "نوع محتوى جديد"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "اسم النوع كما سيظهر على الشاشات."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "جزء محتوى جديد"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "إنشاء"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "قائمة مفصولة بفواصل لتعاريف نوع المحتوى لحذفها"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "تصدير التعريفات المحددة من أنواع وأجزاء المحتوى."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "تحرير نوع المحتوى - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "الحقول"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "تحرير"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "حذف"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "وضع العرض"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "المحرر"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "إضافة حقل"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "أجزاء"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "يحتوي على حقول لنوع المحتوى الحالي"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "إضافة أجزاء"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "أضف جزءاً مسمى"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "حفظ"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "حذف"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" إعدادات مطبقة على \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "اسم الحقل كما سيتم عرضه في الشاشات."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "الاسم التقني للحقل."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "ماهو نوع المحرر المراد استخدامه؟"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "ماهو نمط العرض المراد استخدامه؟"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "حفظ"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "إلغاء"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "يمكن تعريف بعض إعدادات الجزء المشتركة بين كل الأنواع من خلال <a href=\"{0}\">تعريف جزء</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "اسم الجزء كما سيتم عرضه على الشاشات."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "وصف الجزء كما سيتم عرضه على الشاشات."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "ماهو نوع المحرر المراد استخدامه؟"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "ماهو نمط العرض المراد استخدامه؟"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "حفظ"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "إلغاء"
diff --git a/Localization/ar/OrchardCore.Contents.po b/Localization/ar/OrchardCore.Contents.po
index 6c6da25955953..97da0598f04d1 100644
--- a/Localization/ar/OrchardCore.Contents.po
+++ b/Localization/ar/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "تم إيقاف نشر {0}."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "كل أنواع المحتوى"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "حدث خطأ أو أكثر في صحة البيانات."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "تصدير إعدادات مسار التدقيق للمحتوى."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "المحتوى"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "تم"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "ما إذا كان تعليق التدقيق يظهر أثناء التحرير."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "التاريخ عند إنشاء عنصر المحتوى أو عند نشره لأول مره."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "ألغِ"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "و متابعة"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "الإجراءت"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "المحتوى"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "تم حفظ مسودة المحتوى."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "عنصر محتوى"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1743,7 +1743,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "عرض كل أنواع المحتوي"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1785,13 +1785,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "اختر أيقونة"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "عرض كل أنواع المحتوي"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1841,9 +1841,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "الحد من كمية عناصر المحتوى لتقديمها من هذا المصدر. ملاحظة: فقط نوع محتوى واحد قابل للاختيار عند تحديد هذا الخيار."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1857,9 +1857,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "التردد الافتراضي الذي يحتمل أن تتغير به هذه الأنواع من المحتويات."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2035,7 +2035,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "الكل"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2071,7 +2071,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2107,7 +2107,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2143,7 +2143,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "أي نوع محتوى"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2179,7 +2179,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "إنشاء محتوى"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2203,7 +2203,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "اختر إذا تريد نشر العنصر بعد الإنشاء. اتركه غير مختار لإنشاء نسخة مسودة."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2245,7 +2245,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "حذف المحتوى باستخدام المصطلح: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2293,37 +2293,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "عرض المسودة كـ JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "تحميل المسودة كـ JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "عرض المنشور كـ JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "تحميل المنشور كـ JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "عرض كـ JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2353,7 +2353,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2443,7 +2443,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2519,8 +2519,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "المحتوى"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "جديد"
@@ -2543,7 +2543,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "نشر المحتوى بإستخدام التعبير: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2585,7 +2585,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2627,7 +2627,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "إلغاء نشر المحتوى بإستخدام التعبير: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2669,7 +2669,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2681,7 +2681,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/ar/OrchardCore.CustomSettings.po b/Localization/ar/OrchardCore.CustomSettings.po
index e6b4a19a32fb1..7fcc49b9a2e27 100644
--- a/Localization/ar/OrchardCore.CustomSettings.po
+++ b/Localization/ar/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "إعدادات مخصصة"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "الكل"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/ar/OrchardCore.Data.YesSql.po b/Localization/ar/OrchardCore.Data.YesSql.po
index 8e9cbd0f0e361..560cdd6ca20a3 100644
--- a/Localization/ar/OrchardCore.Data.YesSql.po
+++ b/Localization/ar/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/ar/OrchardCore.Demo.po b/Localization/ar/OrchardCore.Demo.po
index 2f87239156d0b..8479edd41aeb5 100644
--- a/Localization/ar/OrchardCore.Demo.po
+++ b/Localization/ar/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "الإسم الأول"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "الإسم الأخير"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/ar/OrchardCore.Deployment.Remote.po b/Localization/ar/OrchardCore.Deployment.Remote.po
index 32d89553538cb..cbd3f24c90acc 100644
--- a/Localization/ar/OrchardCore.Deployment.Remote.po
+++ b/Localization/ar/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "ارسل خطة النشر إلى كائن بعيد."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "إسم العميل"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "إنشاء كائن بعيد"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "الإسم"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "الرابط"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "إسم العميل"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "تحرير العميل البعيد"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "إسم العميل"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "تحرير كائن بعيد"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "الاسم"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "عنوان URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "إسم العميل"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/ar/OrchardCore.Deployment.po b/Localization/ar/OrchardCore.Deployment.po
index 912a35f3b6b3b..25008920ee560 100644
--- a/Localization/ar/OrchardCore.Deployment.po
+++ b/Localization/ar/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "استيراد JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "حذف"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "تم حذف خطة النشر بنجاح."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "الاسم مطلوب."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "خطة النشر بنفس الإسم موجودة مسبقاً."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "تم تحديث خطة النشر بنجاح."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "تم حذف خطة النشر بنجاح."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "إنشاء خطة نشر"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "الملف المخصص المراد إضافته كجزء من خطة النشر."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "اسم الملف الذي سيستخدم عند إضافته للأرشيف."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "خطط النشر"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "الكل"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "تحرير خطة النشر"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -582,7 +582,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -624,7 +624,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "ملف الوصفة المراد إضافته كجزء من خطة النشر."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -636,7 +636,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "اسم الوصفة."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -648,7 +648,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "اسم عرض الوصفة."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -660,7 +660,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "وصف الوصفة."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -672,7 +672,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "مؤلف الوصفة."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -684,7 +684,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "الموقع الإلكتروني للوصفة."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -696,7 +696,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "إصدار الوصفة."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -708,7 +708,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "فئات الوصفة (القيم مفصولة بفاصلة)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/ar/OrchardCore.Diagnostics.po b/Localization/ar/OrchardCore.Diagnostics.po
index 1afd1a57e4e71..0c74cc5b47034 100644
--- a/Localization/ar/OrchardCore.Diagnostics.po
+++ b/Localization/ar/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "أرسل متصفحك طلبا لم يتمكن هذا الخادم من فهمه."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "حدث خطأ اثناء تنفيذ هذا الطلب."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "غير مسموح لك الوصول الى هذا المصدر."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "لم يتم العثور على الصفحة."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "لا تملك الصلاحية لعرض هذا المحتوى."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/ar/OrchardCore.Email.Abstractions.po b/Localization/ar/OrchardCore.Email.Abstractions.po
index b29feb7f43161..c0ed256f388ae 100644
--- a/Localization/ar/OrchardCore.Email.Abstractions.po
+++ b/Localization/ar/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2022-03-05 10:47\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "الحقل {0} إلزامي."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "طريقة إيصال '{0}' غير مدعومة."
diff --git a/Localization/ar/OrchardCore.Email.po b/Localization/ar/OrchardCore.Email.po
index 9f88689cc87dc..a3fc338ded8c3 100644
--- a/Localization/ar/OrchardCore.Email.po
+++ b/Localization/ar/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "مهمة بريد إلكتروني"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "مراسلة"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "فشل"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "إرسال بريد إلكتروني"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "البريد الإلكتروني للمؤلف يعرف من هو مرسل البريد. اتركه فارغاً لإستخدام البريد الإلكتروني الذي تم تعيينه مسبقاً. مع دعم Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "البريد الإلكتروني مطلوب إذا كان مختلف عن عنوان الشخص المرسل. مع دعم Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "البريد الإلكتروني مطلوب إذا كنت تريد الرد يكون مختلف عن عنوان الشخص المرسل. مع دعم Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "يمكن الفصل بين عناوين البريد الإلكتروني للمستقبلين باستخدام الفاصلة، كما يمكن استخدام صيغة Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "إذا تم تحديده، فسيتم إرسال محتوي رسالة البريد الإلكتروني كـ HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "الإعدادات"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "إلى"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "المرسل إختياري، يكون مفيدا عندما يكون كاتب البريد الإلكتروني مختلفا عن مرسله."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "نسخة مخفية"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "نسخة"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "الرد على"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "الموضوع"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "المحتوى"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "ستتم إعادة تحميل الـ tenant الحالي عند حفظ الإعدادات."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "عنوان البريد الإلكتروني الافتراضي لاستخدامه كمرسل، إلا إذا تم تعيين مرسل البريد الإلكتروني."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "خيارات المراسلة عبر الشبكة"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "عنوان خادم SMTP، على سبيل المثال: <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "منفذ الخادم SMTP، غالباً مايكون 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "عند اختيار هذا الخيار، سيتم استخدام هوية الـ \"Application Pool\" أو \"Host-process\" للمصادقة مع خادم البريد."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "إسم المستخدم للمصادقة."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "خيارات تحديد مجلد معين"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "على سبيل المثال: المسار <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> يشير إلى وضع عناوين البريد الإلكتروني في المجلد <i>PickedUpEmail</i> بداخل محرك الأقراص C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/ar/OrchardCore.Facebook.po b/Localization/ar/OrchardCore.Facebook.po
index a0031a5e7d217..ccdb4f216923f 100644
--- a/Localization/ar/OrchardCore.Facebook.po
+++ b/Localization/ar/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "محتوى الفيسبوك لا يحتوي على عبارة Liquid صحيحة. للتفاصيل: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "المحتوى لا يحتوي على عبارة Liquid صحيحة. للتفاصيل: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "إعدادات تسجيل الدخول"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "المسار المطلوب داخل المسار الأساسي للتطبيق حيث سيتم إرجاع وكيل المستخدم إليه. الـ middleware سوف تعالج الطلب عند وصوله."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "قالب الإضافة, بصيغة Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "إصدار الجافاسكربت SDK"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "تهئية في كل صفحة"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/ar/OrchardCore.Features.po b/Localization/ar/OrchardCore.Features.po
index 6a0a0803ec371..4c5d80b0783b1 100644
--- a/Localization/ar/OrchardCore.Features.po
+++ b/Localization/ar/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "مميزات"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "فضلاً أختر واحدة أو أكثر من المميزات."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} كان {1}."
@@ -125,9 +125,9 @@ msgstr "مجموعة إجراءات"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "تعطيل"
@@ -136,8 +136,8 @@ msgstr "تعطيل"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "تفعيل"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "غير مصنف"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "تعطيل الميزة {0} أيضاً سيقوم بتعطيل على المزايا ذات الصلة: {1} متابعة؟"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "تعطيل ميزه"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "نعم"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "لا"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>لا شىء</strong> لا توجد أي نتائج للبحث."
diff --git a/Localization/ar/OrchardCore.Flows.po b/Localization/ar/OrchardCore.Flows.po
index 2ae2bdd75e5f9..e6de89317beb7 100644
--- a/Localization/ar/OrchardCore.Flows.po
+++ b/Localization/ar/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "إضافة عنصر"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "أنوع المحتوى التي يمكن أ يحويها الـ Bag هذا، هي على سبيل المثال: \"شريحة\" ضمن \"شرائع عرض\"."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/ar/OrchardCore.Forms.po b/Localization/ar/OrchardCore.Forms.po
index 529ee9940c7f6..b6943ba31ec12 100644
--- a/Localization/ar/OrchardCore.Forms.po
+++ b/Localization/ar/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "كتبت الخيارات بصيغة خاطئة."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "مهمة إضافة تحقق من الخطأ المودل"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "تحقق"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "مهمة حالة المودل المرتبطة"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "تحقق"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "مهمة التحقق من الـ Antiforgery Token"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "تحقق"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "صحيح"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "غير صحيح"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "مهمة التحقق من حقل النموذج"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "تحقق"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "صحيح"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "غير صحيح"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "مهمة التحقق من النموذج"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "تحقق"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "صحيح"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "غير صحيح"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr "<em>{1}</em> :<em>{0}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "اسم الحقل الذي يحتوي على قيمة غير صحيحة."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "ربط حقول النموذج بحالة الـ model."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "نص الإزرار المراد عرضه."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "نوع الزر."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "رقم المعرف (ID) المراد عرضه لهذا الحقل."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "الاسم الظاهر عند عرض هذا الحقل."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "عنوان URL لإرسال النموذج إليه."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "أسلوب الـ HTTP المراد استخدامه عند إرسال النموذج."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "تحقق لتوليد رمز مكافحة التزوير في النموذج."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "نوع الزر."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "النص المراد عرضه عند خلو الحقل من أي قيمة."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "القيمة الافتراضية لهذا الحقل."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "تحرير البيانات"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "تمثيل القيم المسموح بها بصيغة JSON، على سبيل المثال {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "النص المراد عرضه عند خلو الحقل النصي Textarea من أي قيمة."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "التحقق من <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "اسم حقل النموذج المراد التحقق منه."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "التحقق مما إذا كان النموذج المرسل يحتوي على أخطاء."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/ar/OrchardCore.GitHub.po b/Localization/ar/OrchardCore.GitHub.po
index 34222ea661a20..34d3e3fdbc31a 100644
--- a/Localization/ar/OrchardCore.GitHub.po
+++ b/Localization/ar/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "إعدادات مصادقة جيت هب"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "معرف العميل موجود في التبويب العام لـ <a target=\"_blank\" href=\"https://github.com/settings/apps\">تطبيق جيت هب</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "الرمز السري لتطبيقك."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ar/OrchardCore.Google.po b/Localization/ar/OrchardCore.Google.po
index 01ed55ee3da56..4cb02a017c6e7 100644
--- a/Localization/ar/OrchardCore.Google.po
+++ b/Localization/ar/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "إعدادات تحليلات قوقل"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "إعدادات مصادقة قوقل"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "معرف العميل موجود في واجهة برمجة التطبيقات لقوقل للتطبيق."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "شفرة أمان العميل معرفة في واجهة التطبيقات البرمجية لقوقل للتطبيق."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/ar/OrchardCore.Html.po b/Localization/ar/OrchardCore.Html.po
index 09771379dfc4b..a517988b587f8 100644
--- a/Localization/ar/OrchardCore.Html.po
+++ b/Localization/ar/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "محرر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "المحتوى لعنصر المحتوى."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "ادخل خيارات المحرر"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "توثيق الخيارات"
diff --git a/Localization/ar/OrchardCore.Https.po b/Localization/ar/OrchardCore.Https.po
index 602429afdce21..f4bfc45ea88d5 100644
--- a/Localization/ar/OrchardCore.Https.po
+++ b/Localization/ar/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "تحديد ما إذا كان إعادة التوجيه, 308 نقل بشكل دائم, يجب إستخدامه عوضاً عن إعادة التوجيه المؤقت, 307 موجود, عندما يتم إعادة التوجيه إلى الـ HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/ar/OrchardCore.Infrastructure.Abstractions.po b/Localization/ar/OrchardCore.Infrastructure.Abstractions.po
index 52b802c30bce0..c9579f9496085 100644
--- a/Localization/ar/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/ar/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2022-03-05 10:47\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/ar/OrchardCore.Layers.po b/Localization/ar/OrchardCore.Layers.po
index f694c370d036f..e7752e9484260 100644
--- a/Localization/ar/OrchardCore.Layers.po
+++ b/Localization/ar/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "إنشاء طبقة"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "الإسم"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "الوصف"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "تحرير طبقة - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "الإسم"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "تم نقل الـ widgets بنجاح. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>تراجع</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "المناطق"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "إضافة Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "الطبقات"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "اختر الطبقة للكشف عن الـ widgets المرتبطة بها."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "تحرير"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "حذف"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "الرجاء <a href=\"{0}\">إنشاء طبقة</a> قبل إضافة الـ Widgets"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "إضافة"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "اذا مختار, العنوان سوف يتم عرضه في الـ widget."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "الطبقة المرتبطة بالـ widget."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/ar/OrchardCore.Liquid.po b/Localization/ar/OrchardCore.Liquid.po
index 4ea2fcc3121bb..e44d6f666ed40 100644
--- a/Localization/ar/OrchardCore.Liquid.po
+++ b/Localization/ar/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/ar/OrchardCore.Lists.po b/Localization/ar/OrchardCore.Lists.po
index de019b72a1099..c66e11f8251d6 100644
--- a/Localization/ar/OrchardCore.Lists.po
+++ b/Localization/ar/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "عرض الرابط لعنصر المحتوى الأصل، والترتيب التسلسلي الخاص به."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "عرض تشكيلة من عناصر المحتوى."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "التدوينة المحددة عير موجودة."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "غير مصرح لك بحذف هذا المحتوى"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور غير صحيحة."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "القائمة فارغه"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "القوائم"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "أضف عنصر أصل للقائمة"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/ar/OrchardCore.Localization.po b/Localization/ar/OrchardCore.Localization.po
index 35d708ae568e3..7bd9b0464c5c8 100644
--- a/Localization/ar/OrchardCore.Localization.po
+++ b/Localization/ar/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "اللغات"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "اللغة مطلوبة"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "اللغات النشطة لضبط الموقع."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "إضافة لغة"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/ar/OrchardCore.Markdown.po b/Localization/ar/OrchardCore.Markdown.po
index a739cd72eeacf..80b4dd0aa738f 100644
--- a/Localization/ar/OrchardCore.Markdown.po
+++ b/Localization/ar/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "محرر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "محتوى العنصر على تنسيق Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "محرر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ar/OrchardCore.Media.po b/Localization/ar/OrchardCore.Media.po
index 36fbed218eaf3..8d87280486330 100644
--- a/Localization/ar/OrchardCore.Media.po
+++ b/Localization/ar/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "لا يمكن نقل الوسائط لأن هنالك ملف بنفس الإسم"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: هنالك خطأ اثناء معالجة الملفات."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "إذا كان بإمكانك الحصول على الوسائط المتعددة من المجلد الأساسي أو من كل المجلدات الفرعية."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -778,7 +778,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "عكس"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1010,7 +1010,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "إنشاء مجلد"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1038,7 +1038,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "إعادة تسمية عنصر"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1068,13 +1068,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "وسائط"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "الكل"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1093,43 +1093,43 @@ msgid "Exports all or specified media."
 msgstr "تصدير كل الوسائط أو المختارة فقط."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " مصغرات صغيرة"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " مصغرات كبيرة"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1140,49 +1140,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "إرفاق"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " مصغرات صغيرة"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " مصغرات كبيرة"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "إختر وسائط"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "حسناً"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1302,7 +1302,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ar/OrchardCore.Menu.po b/Localization/ar/OrchardCore.Menu.po
index 3d5b4ab8a4601..c6190e0335c5c 100644
--- a/Localization/ar/OrchardCore.Menu.po
+++ b/Localization/ar/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "القوائم"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "تحرير {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "الإسم"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/ar/OrchardCore.Microsoft.Authentication.po b/Localization/ar/OrchardCore.Microsoft.Authentication.po
index b9c838c602298..4cbafd99f21cf 100644
--- a/Localization/ar/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/ar/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "إعدادات مصادقة حساب مايكروسوفت"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "معرف التطبيق موجود في بوابة التطوير لمايكروسوفت."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "شفرة أمان التطبيق موجودة في بوابة التطوير لمايكروسوفت."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ar/OrchardCore.Navigation.po b/Localization/ar/OrchardCore.Navigation.po
index 153dbdf8699ad..d7f26010ea14a 100644
--- a/Localization/ar/OrchardCore.Navigation.po
+++ b/Localization/ar/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/ar/OrchardCore.Notifications.po b/Localization/ar/OrchardCore.Notifications.po
index 5ade3e9d30368..330bdc4f5c3d9 100644
--- a/Localization/ar/OrchardCore.Notifications.po
+++ b/Localization/ar/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -109,21 +109,21 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -149,15 +149,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -266,13 +266,13 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -336,13 +336,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -366,7 +366,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -390,10 +390,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -440,7 +440,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -464,10 +464,15 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -475,29 +480,19 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/ar/OrchardCore.OpenId.po b/Localization/ar/OrchardCore.OpenId.po
index ce07691a4ebd3..9f3167b7ae982 100644
--- a/Localization/ar/OrchardCore.OpenId.po
+++ b/Localization/ar/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "الإسم مستخدم مسبقاً من قبل نطائق آخر."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "تم تحديث إعدادات خادم الـ OpenID بنجاح."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "تم تحديث إعدادات التحقق للـ OpenID بنجاح."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "إنشاء تطيق جديد"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "معرف العميل"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "الإسم الظاهر"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "التطيقات السرية يجب أن ترسل سرية العميل عندما تتصل مع نقطة نهاية الـ token ونقطة نهاية الفسخ. هذا يضمن أن العميل الشرعي فقط يمكن أن يغير رمز المصادقة والحصول على token محدث."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "السماح بتدفق رمز التحديث المميز"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "السماح بنقطة نهاية تسجيل الخروج"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "إنشاء نطاق جديد"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "الإسم"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "الإسم الظاهر"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "تحرير التطبيق"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "معرف العميل"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "الإسم الظاهر"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "التطيقات السرية يجب أن ترسل سرية العميل عندما تتصل مع نقطة نهاية الـ token ونقطة نهاية الفسخ. هذا يضمن أن العميل الشرعي فقط يمكن أن يغير رمز المصادقة والحصول على token محدث."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "عميل سري"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "السماح بتدفق رمز التحديث المميز"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "تحرير نطاق"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "الإسم"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "الإسم الظاهر"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "ستتم إعادة تحميل الـ tenant الحالية عند حفظ الإعدادات."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "عرض إسم الـ IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "السلطة المستخدمة عند إجراء إستدعاءات OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "الـ 'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "المسار المطلوب داخل المسار الأساسي للتطبيق حيث سيتم إرجاع وكيل المستخدم إليه. الـ middleware سوف تعالج الطلب عند وصوله."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "انظر post_logout_redirect_uri من "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "الرابط حيث سيتم إعادة توجيه وكيل المستخدم بعد تسجيل الخروج من مزود الهوية. سيحدث إعادة التوجيه بعد استدعاء SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "تدفق رمز المصادقة"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "انظر: "
@@ -1217,15 +1217,15 @@ msgstr "استخدم نوع الإستجابة 'code'"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "مثال:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "استخدم نوع الإستجابة 'code token'"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "تدفق التحقق الضمني"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "استخدم نوع الإستجابة 'id_token'"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "استخدم نوع الإستجابة 'id_token'"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "نمط الإستجابة"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "تكوين نمط استجابة انظر: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "المفتاح السري للعميل"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "ضبط المفتاح السري للعميل."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "هذه الخيارات إختيارية وهي للمستخدمين المتقدمين فقط."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "الرابط الأساسي لخادم الهوية (هذا الموقع). إذا لم يتم توفير أي منها ، يتم تلقائيًا حساب القيمة الافتراضية المستندة إلى مضيف الموقع."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "عليك إضافة شهادة إلى خادمك لإعداد الوحدة النمطية لـ OpenId Connect."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "سيتم إعادة تحميل الـ tenant عند حفظ الإعدادات."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "الخادم المرخص"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "عنوان خادم الـ OpenID Connect البعيد. إستخدام عنوان HTTPS يستحسن بشدة."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/ar/OrchardCore.Placements.po b/Localization/ar/OrchardCore.Placements.po
index 3be4b5a2ef6c8..a6d23225d0118 100644
--- a/Localization/ar/OrchardCore.Placements.po
+++ b/Localization/ar/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/ar/OrchardCore.ProjectTemplates.po b/Localization/ar/OrchardCore.ProjectTemplates.po
index eaeb84301f6b6..91e6466cb56b1 100644
--- a/Localization/ar/OrchardCore.ProjectTemplates.po
+++ b/Localization/ar/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "عرض"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ar/OrchardCore.PublishLater.po b/Localization/ar/OrchardCore.PublishLater.po
index 9552b71a9382d..33fba76a914d8 100644
--- a/Localization/ar/OrchardCore.PublishLater.po
+++ b/Localization/ar/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "النشر لاحقا"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "إلغاء النشر لاحقاً"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ar/OrchardCore.Queries.po b/Localization/ar/OrchardCore.Queries.po
index deb9872f0297c..68bce6fc61b16 100644
--- a/Localization/ar/OrchardCore.Queries.po
+++ b/Localization/ar/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "تنفيذ إستعلام SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "حدث خطأ أثناء تنفيذ الاستعلام: {0}"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "استعلام SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -350,7 +350,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "الاستعلام SQL يستخدم المعيار النصي SQL92 و تم تحويله استناداً إلى قاعدة البيانات المتوفرة. ستتم إضافة سابقة ثابته إلى مسميات جداول البيانات آلياً."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "استعلام"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "الإسم الفني للاستعلام."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -472,7 +472,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -538,7 +538,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "عند اختياره، ستكون النتائج في شكل قائمة بأرقام معرفات الوثائق."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/ar/OrchardCore.ReCaptcha.Core.po b/Localization/ar/OrchardCore.ReCaptcha.Core.po
index 12d3ce74655d1..c96296903e53e 100644
--- a/Localization/ar/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/ar/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "فشل التحقق من رمز التحقق البشري"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "فشل التحقق من رمز التحقق البشري"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/ar/OrchardCore.ReCaptcha.po b/Localization/ar/OrchardCore.ReCaptcha.po
index 2e4391d7af6ca..248ca48515cf1 100644
--- a/Localization/ar/OrchardCore.ReCaptcha.po
+++ b/Localization/ar/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "مهمة التحقق من الـ ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "التحقق"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "صالح"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "غير صالح"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "فشل التحقق من رمز التحقق البشري. حاول مرة أخرى."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "ستتم إعادة تحميل نسخة النظام الحالية (tenant) عند حفظ الإعدادت."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "مفتاح الموقع الخاص بأداة قوقل للتحقق البشري (Google's reCaptcha)."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/ar/OrchardCore.Recipes.Core.po b/Localization/ar/OrchardCore.Recipes.Core.po
index f76a46f869c6a..f9385743ba950 100644
--- a/Localization/ar/OrchardCore.Recipes.Core.po
+++ b/Localization/ar/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/ar/OrchardCore.Roles.po b/Localization/ar/OrchardCore.Roles.po
index d5ee19ae7bf60..b88a8606b1daa 100644
--- a/Localization/ar/OrchardCore.Roles.po
+++ b/Localization/ar/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "الأدوار"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "إسم الدور غير صحيح."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "تم تعديل الدور بنجاح."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "لا يمكن حذف أدوار النظام."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "إنشاء دور"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "إسم الدور"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "تعديل تفاصيل الدور"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "صلاحية"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "هذه الصلاحية تسمح للمستخدم برفع صلاحياته الآخرى. امنحها مع النظر الشديد."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "إلغاء"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "الأدوار"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/ar/OrchardCore.Rules.po b/Localization/ar/OrchardCore.Rules.po
index de2c92d8c2f41..9845158b668b7 100644
--- a/Localization/ar/OrchardCore.Rules.po
+++ b/Localization/ar/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-17 16:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/ar/OrchardCore.Search.Elasticsearch.po b/Localization/ar/OrchardCore.Search.Elasticsearch.po
index e26d44691bacf..ce4b7a5bf37e5 100644
--- a/Localization/ar/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/ar/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -818,7 +854,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -860,7 +896,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -872,7 +908,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -890,7 +926,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/ar/OrchardCore.Search.Lucene.po b/Localization/ar/OrchardCore.Search.Lucene.po
index ac8c0cd003763..2c7cb6de2c93e 100644
--- a/Localization/ar/OrchardCore.Search.Lucene.po
+++ b/Localization/ar/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -528,13 +528,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -576,13 +576,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -624,13 +624,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -654,7 +654,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -678,7 +678,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -696,7 +696,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -720,7 +720,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -810,7 +810,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -822,7 +822,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -840,7 +840,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -871,7 +871,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/ar/OrchardCore.Search.po b/Localization/ar/OrchardCore.Search.po
index f5f6bda4c1849..15d23c5efbd18 100644
--- a/Localization/ar/OrchardCore.Search.po
+++ b/Localization/ar/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr "موفر البحث الافتراضي لاستخدامه لصفحة البحث."
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/ar/OrchardCore.Security.po b/Localization/ar/OrchardCore.Security.po
index 750d31130dad0..15c440813e3b8 100644
--- a/Localization/ar/OrchardCore.Security.po
+++ b/Localization/ar/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr "الإعدادات الحالية قادمة من مصادر الإعدادات، حفظ الإعدادات سوف يؤثر على إعدادات المدير وليس الإعدادات."
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr "يسمح للمسؤولين بالتحكم في الموارد التي يسمح لوكيل المستخدم بتحميلها لصفحة معينة."
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr "يسمح لموقع بالتحكم في الميزات و APIs التي يمكن استخدامها في المتصفح."
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/ar/OrchardCore.Seo.po b/Localization/ar/OrchardCore.Seo.po
index a54b2dc6f5bb8..010f7eb2b18ae 100644
--- a/Localization/ar/OrchardCore.Seo.po
+++ b/Localization/ar/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/ar/OrchardCore.Settings.po b/Localization/ar/OrchardCore.Settings.po
index f59cbd7fe18fd..5736310c3abee 100644
--- a/Localization/ar/OrchardCore.Settings.po
+++ b/Localization/ar/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "تم تحديث إعدادات الموقع بنجاح."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "الرابط الأساسي يجب أن يكون عنوان URL مؤهل تماما."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "إعدادت الموقع"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/ar/OrchardCore.Setup.Core.po b/Localization/ar/OrchardCore.Setup.Core.po
index 8ee5d07350a18..bf62f51c3090b 100644
--- a/Localization/ar/OrchardCore.Setup.Core.po
+++ b/Localization/ar/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/ar/OrchardCore.Setup.po b/Localization/ar/OrchardCore.Setup.po
index 81eec45366826..a507e2520f43f 100644
--- a/Localization/ar/OrchardCore.Setup.po
+++ b/Localization/ar/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "كلمة المرور يجب أن تحتوي على الأقل {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "ليس من الممكن تنصيب الموقع دون وصفة."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "هذا سيستخدم كعنوان إفتراضي لصفحاتك."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "الوصفات تسمح لك بتثبيت موقعك بخيارات إضافية تم تكوينها مسبقاً."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "حدد المنطقة الزمنية الإفتراضية التي سيتم إستخدامها لعرض وتعديل التواريخ والأوقات."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "قاعدة البيانات تستخدم لتخزين إعدادات الموقع ومحتوياته."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "يمكنك تحديد بادئة الجدول إذا كنت تنوي إعادة استخدام نفس قاعدة البيانات لمواقع متعددة."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "إظهار/إخفاء نص الإتصال"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "المستخدم المتميز يمتلك كل الصلاحيات. ينبغي إستخدامه اثناء التثبيت و التعافي من الكوارث."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "إسم المستخدم"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "البريد الإلكتروني غير صحيح."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "قوة كلمة المرور"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/ar/OrchardCore.Shortcodes.po b/Localization/ar/OrchardCore.Shortcodes.po
index 33a70a6b82a34..874bb5d242669 100644
--- a/Localization/ar/OrchardCore.Shortcodes.po
+++ b/Localization/ar/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "المحتوى إلزامي."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "المحتوى لا يحتوي على عبارة Liquid صحيحة. للتفاصيل: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/ar/OrchardCore.Sitemaps.po b/Localization/ar/OrchardCore.Sitemaps.po
index 55ffea09d5b81..37f67a7f793eb 100644
--- a/Localization/ar/OrchardCore.Sitemaps.po
+++ b/Localization/ar/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1036,7 +1036,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1048,7 +1048,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/ar/OrchardCore.Sms.po b/Localization/ar/OrchardCore.Sms.po
index b946800d40b2f..1325c5dd50ca5 100644
--- a/Localization/ar/OrchardCore.Sms.po
+++ b/Localization/ar/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-21 15:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/ar/OrchardCore.Spatial.po b/Localization/ar/OrchardCore.Spatial.po
index a0d334044e544..93d0cca66a800 100644
--- a/Localization/ar/OrchardCore.Spatial.po
+++ b/Localization/ar/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ar/OrchardCore.Taxonomies.po b/Localization/ar/OrchardCore.Taxonomies.po
index f95d3cd68a8cf..72b20686cf6d2 100644
--- a/Localization/ar/OrchardCore.Taxonomies.po
+++ b/Localization/ar/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "التصنيف غير موجود. الرجاء التحقق من الإعدادات لهذا الحقل."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "تلميح نصي يظهر لهذا الحقل في المحرر."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "تصنيف"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "مطلوب"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "ما إذا كان هناك حقل واحد على الأقل تم اختياره."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "فريد"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "الأطراف فقط"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "- ما إذا كانت الأطراف هي العناصر التي يمكن اختيارها."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "مصطلح نوع المحتوى"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "إضافة {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "قمت بترتيب القوائم."
diff --git a/Localization/ar/OrchardCore.Templates.Cms.Module.po b/Localization/ar/OrchardCore.Templates.Cms.Module.po
index f8e3a62164410..584fc28b0b7b9 100644
--- a/Localization/ar/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/ar/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "عرض"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ar/OrchardCore.Templates.po b/Localization/ar/OrchardCore.Templates.po
index 6f70d4bb22017..4b56497185702 100644
--- a/Localization/ar/OrchardCore.Templates.po
+++ b/Localization/ar/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "تم إنشاء القالب \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "معاينة"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "إسم القالب."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "وصف القالب."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "معاينة"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "إسم القالب."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "وصف القالب."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/ar/OrchardCore.Tenants.po b/Localization/ar/OrchardCore.Tenants.po
index 4bb4e862f64a3..12bd992de4674 100644
--- a/Localization/ar/OrchardCore.Tenants.po
+++ b/Localization/ar/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "المستأجرون"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "جميع الحالات"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "جارية التنفيذ"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "معطلة"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "غير مهيئة"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "الإسم"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "الحالة"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "تعطيل"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "تفعيل"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "لا يمكنك تعطيل المتجر الإفتراضي."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "المستأجر '{0}' معطل بالفعل."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "المستأجر '{0}' ممكَّن بالفعل."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "يمكنك فقط تمكين الـ tenant المعطلة."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "لم يتم العثور على الـ tenant: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "لا يمكن تثبيت الـ tenant."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "مزود قاعدة البيانات غير معرف."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "نص الإتصال مطلوب لهذا المزود."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "الوصفة أو إسمها مطلوب."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "لم يتم العثور على الوصفة '{0}'."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "إنشاء tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "تحرير tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1242,8 +1236,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "تصميم"
@@ -1260,7 +1254,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1272,49 +1266,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "ما هو نوع قاعدة البيانات المستخدمة؟"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "بادئة الجدول"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "نص الربط"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1332,7 +1326,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/ar/OrchardCore.Tests.po b/Localization/ar/OrchardCore.Tests.po
index 313102dea19a4..ae51e86c4d215 100644
--- a/Localization/ar/OrchardCore.Tests.po
+++ b/Localization/ar/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/ar/OrchardCore.Themes.po b/Localization/ar/OrchardCore.Themes.po
index 5da990cce4acb..a8cf7749059c1 100644
--- a/Localization/ar/OrchardCore.Themes.po
+++ b/Localization/ar/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "صدر السمات المحدة حالياً."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ar/OrchardCore.Title.po b/Localization/ar/OrchardCore.Title.po
index a975e568accec..4dd02c4efe1ff 100644
--- a/Localization/ar/OrchardCore.Title.po
+++ b/Localization/ar/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "النمط لا يحتوي على عبارة Liquid صحيحة. للتفاصيل: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "تحقق من عرض العنوان في واجهات العرض."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ar/OrchardCore.Twitter.po b/Localization/ar/OrchardCore.Twitter.po
index 6f60dc8f474b1..8e4509420c46a 100644
--- a/Localization/ar/OrchardCore.Twitter.po
+++ b/Localization/ar/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "رمز الوصول الأمن مطلوب"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "مهمة تحديث حالة تويتر"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "التواصل الاجتماعي"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "فشل"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr "تويتر"
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "ستتم إعادة تحميل الـ tenant الحالي عند حفظ الإعدادات."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "إعدادات تكامل تويتر"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "مفتاح API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "مفتاح الـ API معرف في تبويب المفاتيح والرموز للوحة الإعدادات لتطبيق تويتر."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "المفتاح السري للـ API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "المفتاح السري للـ API معرف في تبويب المفاتيح والرموز للوحة الإعدادات لتطبيق تويتر."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "رمز الوصول"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "رمز الوصول معرف في توبيب المفاتيح ورموز الوصول للوحة الإعدادات تطبيق تويتر."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "رمز الوصول السري"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "رمز الوصول السري معرف في توبيب المفاتيح ورموز الوصول للوحة الإعدادات تطبيق تويتر."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "تسجيل الدخول بإستخدام إعدادات تويتر"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "تحديث حالة تويتر"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/ar/OrchardCore.Users.Core.po b/Localization/ar/OrchardCore.Users.Core.po
index ac675417f7046..fe577bb5afae1 100644
--- a/Localization/ar/OrchardCore.Users.Core.po
+++ b/Localization/ar/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "البريد الإلكتروني '{0}' غير صحيح."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "خطأ غير متوقع: '{0}'."
diff --git a/Localization/ar/OrchardCore.Users.po b/Localization/ar/OrchardCore.Users.po
index 31f93aca2d415..0cdf11df603ff 100644
--- a/Localization/ar/OrchardCore.Users.po
+++ b/Localization/ar/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "تم إنشاء المستخدم بنجاح"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "تسجيل الدخول محلياً مُعطَّل."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "تم اقفال هذا الحساب"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "محاولة تسجيل الدخول غير صحيحة."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "تم تغيير كلمة المرور بنجاح."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "حدث خطأ في موفر خارجي."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "الموقع لا يسمح بتسجيل المستخدم."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "أكِّد حسابك"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "المستخدم المحدد غير مسموح له من تسجيل الدخول."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "يجب عليك تأكيد البريد الإلكتروني."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "كل المستخدمين"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "المستخدمين المفعلين"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "المستخدمين المعطلين"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "الاسم"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "قبول"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "تفعيل"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "تعطيل"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "حذف"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "كل الأدوار"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "مصادقة (بدون أدوار)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "قبول المستخدم {0} بنجاح."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "حذف المستخدم {0} بنجاح."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "تعطيل المستخدم {0} بنجاح."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "تفعيل المستخدم {0} بنجاح."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "تم إنشاء المستخدم بنجاح."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "تم تحديث المستخدم بنجاح."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "تم حذف المستخدم بنجاح."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "تعذر حذف المستخدم."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "تم تحديث كلمة المرور بشكل صحيح."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "تم إلغاء قفل المستخدم بنجاح."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "تعذر إلغاء قفل المستخدم."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "إعدادات تسجيل الدخول"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "تصدير إعدادات تسجيل الدخول."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "تغيير إعدادات البريد الإلكتروني"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "تصدير إعدادات البريد الإلكتروني."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "إعدادت التسجيل"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "تصدير إعدادات التسجيل."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "إعادة تعيين إعدادات كلمة المرور"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "تصدير إعدادات تعيين كلمة المرور."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "كلمة المرور الجديدة وتأكيدها غير متطابقين."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "مهمة إسناد دور للمستخدم"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "مستخدم"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "فشل"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "مهمة تسجيل مستخدم"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "مستخدم"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "صحيح"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "غير صحيح"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "لا تتوفر خدمة البريد الإلكتروني"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "حدث تحديث مستخدم"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "مستخدم"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "التحقق من مستخدم"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "مجهول"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "مصدق"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "دور"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "القيمة إلزامية للحقل '{0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} إلى الدور {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "المستخدم المراد إسناده. مع دعم الـ Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "تغيير كلمة المرور"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "كلمة المرور الحالية"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "إنشاء مستخدم"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "تغيير كلمة المرور"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "يرجى التحقق من بريدك الإلكتروني لإعادة تعيين كلمة مرورك."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "تغيير البريد الإلكتروني"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "لقد نجحت في المصادقة مع <strong>{0}</strong>. لديك بالفعل حساب مع عنوان البريد الإلكتروني هذا. أدخل كلمة مرور حسابك المحلي وانقر على زر التسجيل لربط الحسابات وإنهاء تسجيل الدخول."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "تسجيل الدخول"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "استخدام خدمة آخري لتسجيل الدخول"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "تسجيل الدخول باستخدام حسابك {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "إنشاء حساب جديد."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "كلمة المرور"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "تم المصادقة بنجاح مع <strong>{0}</strong>. الرجاء ملء النموذج أدناه وانقر على زر التسجيل لإكمال التسجيل."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "كلمة المرور"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "إرسال تأكيد على البريد الإلكتروني"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "موضوع الرسالة. يدعم بناء صيغة Liquid."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "الرئيسية"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "إعادة تعيين كلمة المرور"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "تم تعطيل المستخدم"
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "تم تفعيل المستخدم."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "قم بإلغاء التحديد لتعطيل حساب المستخدم هذا."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3360,7 +3432,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3426,7 +3498,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3450,16 +3522,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "تعيين خاصية \"اسم المستخدم\" لسير العمل إذا تم مصادقة المستخدم"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "الأدوار"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/ar/OrchardCore.Widgets.po b/Localization/ar/OrchardCore.Widgets.po
index e8a08824bedfc..473cc6c657ed7 100644
--- a/Localization/ar/OrchardCore.Widgets.po
+++ b/Localization/ar/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "اضافة ودجت"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "قياسي"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/ar/OrchardCore.Workflows.po b/Localization/ar/OrchardCore.Workflows.po
index ef268f1378a57..999ac46eeed73 100644
--- a/Localization/ar/OrchardCore.Workflows.po
+++ b/Localization/ar/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-17 17:52\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "تنفيذ مهمة المعاملة"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "جلسة"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "تم"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "صحيح"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "غير صحيح"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "مهمة ربط"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "أوليات"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "مهة For Each"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "دورة"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "مهمة تفرع"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "مهمة دوران For"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "دورة"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "مهمة If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "صحيح"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "خاطيء"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "مهمة ربط"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "مرتبط"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "مهمة تسجيل حدث"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "أوليات"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "تم"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "استثناءات"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "مهمة تذكير"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "واجهة المستخدم"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "مهمة سكربت"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "مهمة ضبط الإخراج"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "أوليات"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "مهمة ضبط خاصية"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "أوليات"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "مهمة دوران While"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "التحكم بالمسير"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "دورة"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "تم"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "تم تحديث النشاط بنجاح."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "أنشئت مؤخراً"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "تم إنشاؤه مؤخراً"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "خطأ"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "إنتهت"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "حذف"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "تم حذف المسير {0} بنجاح."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "حذف"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "تم حذف المسير {0} بنجاح."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "تم حفظ مسار العمل."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "تم حذف {0} مسار عمل"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "مهمة إعادة توجيه Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "تم"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "حدث طلب Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "تم"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "متطابقة"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "مهمة طلب Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "حالة HTTP غير معالجة"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "مهمة إستجابة Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "تم"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "غير مصرح له بتشغيل {0}."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "المهمة الأولية"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "تحرير"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "إضافة"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "علاقة إعتمادية"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "رجوع"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "هل أنت متأكد من أنك تريد حذف حالة مسار العمل هذه؟"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "حذف"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "متقدم"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "قيمة مهلة القفل انتهت في تبويب المتقدمة"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "مهلة القفل بالملي ثانية للحصول على قفل قبل استئناف حالة مسار عمل معين من هذا النوع الذري. اتركه صفر لعدم استخدام أي قفل."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "الأحداث المتوفرة"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "المهام المتوفرة"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "هل أنت متأكد من حذف هذا النشاط؟"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "تصفية"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "متقدم"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "قيمة مهلة القفل انتهت في تبويب المتقدمة"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "مهلة القفل بالملي ثانية للحصول على قفل قبل استئناف حالة مسار عمل معين من هذا النوع الذري. اتركه صفر لعدم استخدام أي قفل."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "التكرار <em>{0}</em> على <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "قائمة للتكرار. مع دعم الجافا سكريبت."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "لا يوجد تفرعات"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "كرر <em>{0}</em> من <em>{1}</em> إلى <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "قيمة البداية. مع دعم الجافا سكربت."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "قيمة النهاية. مع دعم الجافا سكربت."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "قيمة الخطوة في الدوران. مع دعم الجافا سكربت."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "إعادة توجيه HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "الرابط الذذي سيتم إعادة التوجية إليه. مع دعم الـ Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "دائم"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "اختر إذذا اردت إعادة التوجيه أن يكون دائماً (301). اترك الخيار لإعادة التوجيه المؤقت (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "معالجة طلب HTTP وارد"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "أي سخص يقوم بإستدعاء الرابط سيقوم بتشغيل تدفق العمل. احفظه في مكان آمن."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "التحقق من الـ Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "قم بإلغاء تحديد هذا الخيار إذا كان الطلب يأتي من خدمة تستدعي هذا العنوان كـ webhook. إذا كان الرابط هذا مطلوب من نموذج، قم بالاحتفاظ بهذا الخيار محدداً لضمان عدم العبث بقيم النموذج."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "فترة حياة الـ Token"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "انقر زر <b>إعادة توليد</b> بعد تغيير القيمة."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "عدد الأيام لإنتهاء صلاحية الـ token. 0 للـ token الذي لا تاريخ انتهاء له"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "تصفية طلب HTTP وارد"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "أسلوب HTTP للمطابقة."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "إسم المتحكم للمطابقة."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "إسم الإجراء للمطابقة."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "رابط لإرسال الطلب. يدعم التنسيق Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "اسلوب HTTP. مثل GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "نوع المحتوى لمحتوى الطلب."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "المحتوى المراد إرساله مع طلبات POST, PUT و PATCH. يدعم تنسيق Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "توفير رؤوس HTTP إضافية، واحد في كل سطر. فعلى سبيل المثال: Authorization: Bearer 123ABC. مع دعم Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "إستجابة HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "رمز حالة HTTP لإرسالة مره آخرى. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">انقر هنا</a> للحصول على القائمة كاملة."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "نوع المحتوى لمحتوى الطلب."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "المحتوى الذي سيتم إرساله مره آخرى. يدعم تنسيق Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "حساب <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1714,40 +1778,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "الفرز"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "هل أنت متأكد من أنك تريد حذف حالة مسار العمل هذه؟"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "حذف"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "إنشاء {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>لا شي هنا!</strong> لاتوجد أنواع تدفق عمل موقفه في الوقت الحالي."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "رجوع"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "تم تحديدها"
@@ -1854,17 +1932,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "معطل"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "لا توجد كائنات"
-msgstr[1] "كائن"
-msgstr[2] "كائنين"
-msgstr[3] "بعض الكائنات"
-msgstr[4] "مجموعة كائنات"
-msgstr[5] "{0} كائنات"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1898,7 +1970,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "في إنتظار <strong>أي</strong> الأنشطة المتجهة للداخل قبل الإنضمام إلى التنفيذ في مسار واحد."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1928,7 +2000,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "سجل"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1940,7 +2012,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "مستوى السجل."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1988,7 +2060,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} إشعارات"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -2000,7 +2072,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "نوع الإشعار."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2030,7 +2102,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "سكريبت"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2042,7 +2114,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "قائمة مفصولة بفواصل من المخرجات المتوفرة."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2072,7 +2144,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "الإخراج عن طريق {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2084,7 +2156,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "الإسم لإخراجه."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2114,7 +2186,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "ضبط الخاصية {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2126,7 +2198,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "الخاصية المراد ضبطها. إذذا كانت الخاصية غير موجودة بعد, سيتم إضافتها."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2162,7 +2234,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "عندما يتم تشغيل <em>{0}</em>"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2198,7 +2270,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2252,7 +2324,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "لا توجد إجراءات محددة"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2264,7 +2336,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "ادخل إسم اجراء أو قائمة أسماء مفصولة بفواصل."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2300,7 +2372,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "كرر بينما <em>{0}</em> صحيح"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2324,3 +2396,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "قم بالتكرار بينما الشرط صحيحاً."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/ar/TheAdmin.po b/Localization/ar/TheAdmin.po
index cbf9e1fde7875..2c5cee4b10029 100644
--- a/Localization/ar/TheAdmin.po
+++ b/Localization/ar/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "المظهر الفاتح"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "المظهر الغامق"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "زيارة الموقع"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "إغلاق/فتح القائمة"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "حذف"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "هل أنت متأكد أنك تريد حذف هذا العنصر؟"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "موافق"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "إلغاء"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ar/TheAgencyTheme.po b/Localization/ar/TheAgencyTheme.po
index 045e1e383908c..6beafdb791e70 100644
--- a/Localization/ar/TheAgencyTheme.po
+++ b/Localization/ar/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "لا توجد أي نتائج."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "لم يتم العثور على الصفحة"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "لا يمكن العقور على الصفحة التي طلبتها."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ar/TheBlogTheme.po b/Localization/ar/TheBlogTheme.po
index 4de5b3101f2c0..93ea1583c3f26 100644
--- a/Localization/ar/TheBlogTheme.po
+++ b/Localization/ar/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "في {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "لا توجد أي نتائج."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "الصفحة غير موجوده"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ar/TheTheme.po b/Localization/ar/TheTheme.po
index b8b8297bc63b3..23dd39610fb63 100644
--- a/Localization/ar/TheTheme.po
+++ b/Localization/ar/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,57 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/bg-BG/OrchardCore.Admin.po b/Localization/bg-BG/OrchardCore.Admin.po
index c32b254f3fe8a..7e8ead805666d 100644
--- a/Localization/bg-BG/OrchardCore.Admin.po
+++ b/Localization/bg-BG/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Администратор"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Административни настройки"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Експорт на административните настройки."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Чувствайте се свободни да разглеждате менюто и да откриете всички негови възможности."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Активирай тъмен режим на админ темата"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Визуализиране на тъмния режим на админ темата."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Администратор"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/bg-BG/OrchardCore.AdminDashboard.po b/Localization/bg-BG/OrchardCore.AdminDashboard.po
index 1971513617a64..338dda9085ceb 100644
--- a/Localization/bg-BG/OrchardCore.AdminDashboard.po
+++ b/Localization/bg-BG/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/bg-BG/OrchardCore.AdminMenu.po b/Localization/bg-BG/OrchardCore.AdminMenu.po
index 963855a20f1e7..347418770db05 100644
--- a/Localization/bg-BG/OrchardCore.AdminMenu.po
+++ b/Localization/bg-BG/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Създай админ меню {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Име"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Създай възел"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Редактирай Админ Меню: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Редактирай възел"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Тази връзка ще бъде с приоритет и ще е активна, в случай че друга връзка сочи към същия адрес. Връзката с най-висока стойност има активен статус в навигацията."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Ред на позициониране на тази връзка в админ менюто."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Линк"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Текста към линка, който ще бъде показан в структурата."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Адресът на връзката. Връзка ще бъде показана, само ако тя или техни поделемента имат url. Url-ът ще съоответства на основния администраторски сайт"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Избери икона"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Текстът на елемента от менюто както ще бъде видим в структурата."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Избор"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Избери иконка, която ще е видима, в случай че елемента от менюто е първо ниво."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Избери икона"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/bg-BG/OrchardCore.Alias.po b/Localization/bg-BG/OrchardCore.Alias.po
index 2e40d6ba93332..30251e7d7706a 100644
--- a/Localization/bg-BG/OrchardCore.Alias.po
+++ b/Localization/bg-BG/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Моделът не съдържа валиден Liquid израз. Детайли: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Остави празно за генериране."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Стандарно"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias (псевдонимът) се генерира и въвеждането му не е активно"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/bg-BG/OrchardCore.ArchiveLater.po b/Localization/bg-BG/OrchardCore.ArchiveLater.po
index 6884765f6466f..7a151fcdea1a4 100644
--- a/Localization/bg-BG/OrchardCore.ArchiveLater.po
+++ b/Localization/bg-BG/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/bg-BG/OrchardCore.AuditTrail.po b/Localization/bg-BG/OrchardCore.AuditTrail.po
index 2237552cf56f8..cde0ff31885ee 100644
--- a/Localization/bg-BG/OrchardCore.AuditTrail.po
+++ b/Localization/bg-BG/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/bg-BG/OrchardCore.Autoroute.po b/Localization/bg-BG/OrchardCore.Autoroute.po
index 31977ecb64460..0491f18c8c797 100644
--- a/Localization/bg-BG/OrchardCore.Autoroute.po
+++ b/Localization/bg-BG/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Поставете отметка за да забраните автоматичният път до това съдържание."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Поставете отметка, за да посочите, че елемент от дъщерно съдържание ще бъде насочен към абсолютен път."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/bg-BG/OrchardCore.BackgroundTasks.po b/Localization/bg-BG/OrchardCore.BackgroundTasks.po
index db2f92204fc3b..47ff4cb064d41 100644
--- a/Localization/bg-BG/OrchardCore.BackgroundTasks.po
+++ b/Localization/bg-BG/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-22 07:32\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/bg-BG/OrchardCore.ContentFields.po b/Localization/bg-BG/OrchardCore.ContentFields.po
index 170e0a906a818..6ee980ecfe306 100644
--- a/Localization/bg-BG/OrchardCore.ContentFields.po
+++ b/Localization/bg-BG/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Превключване"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към полето на този редактор."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Няма елементи със съдържание."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Стандартен"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Не е публикуван"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Пишете тук за търсене"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Избор"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Премахни"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Не са намерени разултати"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Дали да се позволи избор на повече от един елемента."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Показване на всички типове съдържание"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Показване на типовете съдържание. Изберете поне един."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към полето на този редактор."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Локализиран"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали се изисква стойност."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към полето на този редактор."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали се изисква стойност."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg редактор"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документация за опциите"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Текст за линка"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Дали url е задължителен."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Използвай url на връзката"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Текст подсказка, който ще се визуализира към url на този редактор."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Текст подсказка, който ще се визуализира към текста на връзката на този редактор."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Подсказка (placeholder), която ще се визуализира, в случай че полето за url е непопълнено."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Подсказка (placeholder), която ще се визуализира, в случай че полето за текст е непопълнено."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Валиден url, предложен при създаването на елемент."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Няма елементи със съдържание."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Стандартен"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Не е публикуван"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Пишете тук за търсене"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Избор"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Премахни"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Не са намерени разултати"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Дали да се позволи избор на повече от един елемента."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Показване на типовете съдържание. Изберете поне един."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Обхват"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Няма"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали се изисква стойност."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към това поле на редактора."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Подсказка, която ще се визуализира, в случай че полето за въвеждане остане празно. (не е задължително)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Брой цифри след десетичната запетая."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Минималната разрешена стойност. (не е задължително)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Максималната разрешена стойност. (не е задължително)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Редактиране на данни"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Представяне на разрешените стойности под формата на JSON, напр. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Отказ"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали се изисква стойност."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към полето на този редактор."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали се изисква стойност."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Задължително"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Дали се изисква стойност."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Подсказка"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към това поле на редактора."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Ширина"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Ширината на Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Височина"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Височина на Videobox"
diff --git a/Localization/bg-BG/OrchardCore.ContentLocalization.po b/Localization/bg-BG/OrchardCore.ContentLocalization.po
index 415c575dfa84d..4ef944b7714d1 100644
--- a/Localization/bg-BG/OrchardCore.ContentLocalization.po
+++ b/Localization/bg-BG/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/bg-BG/OrchardCore.ContentPreview.po b/Localization/bg-BG/OrchardCore.ContentPreview.po
index 31b42986ec5d2..4ae3b4ab7e17b 100644
--- a/Localization/bg-BG/OrchardCore.ContentPreview.po
+++ b/Localization/bg-BG/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Моделът не съдържа валиден Liquid израз. Детайли: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Преглед"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Прегледът е прекъснат"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Грешка при преглед"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/bg-BG/OrchardCore.ContentTypes.po b/Localization/bg-BG/OrchardCore.ContentTypes.po
index 2203e147acebe..ff2157c3e95d7 100644
--- a/Localization/bg-BG/OrchardCore.ContentTypes.po
+++ b/Localization/bg-BG/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/bg-BG/OrchardCore.Contents.po b/Localization/bg-BG/OrchardCore.Contents.po
index 4dbe4dfcc127d..a66a4ae42e1a2 100644
--- a/Localization/bg-BG/OrchardCore.Contents.po
+++ b/Localization/bg-BG/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Публикацията на {0} е премахната."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Всички типове съдържание"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Съдържание"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Готово"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Датата на създаване на елемента със съдържание или първата публикация."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "и продължи"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Действия"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Съдържание"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Отказ"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Съдържание"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Нов"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/bg-BG/OrchardCore.CustomSettings.po b/Localization/bg-BG/OrchardCore.CustomSettings.po
index 3af295eb4b8d2..1f48edf61da90 100644
--- a/Localization/bg-BG/OrchardCore.CustomSettings.po
+++ b/Localization/bg-BG/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Собствени настройки"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Всички"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/bg-BG/OrchardCore.Data.YesSql.po b/Localization/bg-BG/OrchardCore.Data.YesSql.po
index a96bb2c9cfae1..9c79c4108898d 100644
--- a/Localization/bg-BG/OrchardCore.Data.YesSql.po
+++ b/Localization/bg-BG/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/bg-BG/OrchardCore.Demo.po b/Localization/bg-BG/OrchardCore.Demo.po
index 1e3bd28020b67..817d61e050cfb 100644
--- a/Localization/bg-BG/OrchardCore.Demo.po
+++ b/Localization/bg-BG/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Собствено име"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Фамилно Име"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/bg-BG/OrchardCore.Deployment.Remote.po b/Localization/bg-BG/OrchardCore.Deployment.Remote.po
index 40c8bb710c958..66ebbec414340 100644
--- a/Localization/bg-BG/OrchardCore.Deployment.Remote.po
+++ b/Localization/bg-BG/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Изпраща плана за публикуване към отдалечена инстанция."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Клиентско име"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Създай отдалечена инстанция"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Клиентско име"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Редактирай отдалечен клиент"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Клиентско име"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Редактирай отдалечена инстанция"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Клиентско име"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/bg-BG/OrchardCore.Deployment.po b/Localization/bg-BG/OrchardCore.Deployment.po
index 16cd9bd23c2df..df707eea3ba4e 100644
--- a/Localization/bg-BG/OrchardCore.Deployment.po
+++ b/Localization/bg-BG/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON импорт"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Изтрий"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Името е задължително."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "План за публикуване с това име вече съществува."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Създай план за публикуване"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Персонален файл за добавяне като част от плана."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Име на файла, с което ще бъде добавен към архива."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Планове за публикуване"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Всички"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Редактирай план за публикуване"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Файл-рецепта за добавяне като част от плана."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Наименованието на рецептата."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Показвано име на рецептата."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Описание на рецептата."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Автор на рецептата."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Уебайт-рецепта."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Версия на рецептата."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Категории на рецептата (стойности разделени със запетая)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/bg-BG/OrchardCore.Diagnostics.po b/Localization/bg-BG/OrchardCore.Diagnostics.po
index c44aea6d2d380..2b7d4790d44ec 100644
--- a/Localization/bg-BG/OrchardCore.Diagnostics.po
+++ b/Localization/bg-BG/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Вашият браузър изпрати заявка, която сървърът не може да разпознае."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Възникна грешка при изпълнение на заявката."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Нямате достъп до този ресурс."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Страницата не може да бъде намерена."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Нямате права да преглеждате това съдържание."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/bg-BG/OrchardCore.Email.Abstractions.po b/Localization/bg-BG/OrchardCore.Email.Abstractions.po
index 61aeb454407c9..ddb9a9a31de71 100644
--- a/Localization/bg-BG/OrchardCore.Email.Abstractions.po
+++ b/Localization/bg-BG/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Полето {0} е задължително."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "'{0}' метод за доставка на e-mail не се поддържа."
diff --git a/Localization/bg-BG/OrchardCore.Email.po b/Localization/bg-BG/OrchardCore.Email.po
index 4501e4015c450..56c4da4f386e9 100644
--- a/Localization/bg-BG/OrchardCore.Email.po
+++ b/Localization/bg-BG/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/bg-BG/OrchardCore.Facebook.po b/Localization/bg-BG/OrchardCore.Facebook.po
index 8229b4c7c3213..16a7f9e8f1274 100644
--- a/Localization/bg-BG/OrchardCore.Facebook.po
+++ b/Localization/bg-BG/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "FaceBook текста не съдържа валиден Liquid израз. Детайли: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Пълният текст не съдържа валиден Liquid израз. Детайли: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Настройки за влизане"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Заявения адрес в рамките на базовия адрес на приложението където потребителят ще бъде върнат. Междинният процес ще придвижи заявката когато я получи."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Шаблона на plugin-а, в Liquid формат."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Javascript SDK Версия"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Инициализиране на всяка страница"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/bg-BG/OrchardCore.Features.po b/Localization/bg-BG/OrchardCore.Features.po
index 898ae9ea26c69..6e6e8111e6c61 100644
--- a/Localization/bg-BG/OrchardCore.Features.po
+++ b/Localization/bg-BG/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Свойства"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Моля, изберете едно или повече свойства."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Групови действия"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Деактивирай"
@@ -136,8 +136,8 @@ msgstr "Деактивирай"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Активирай"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Некатегоризиран"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Деактивирането на {0} свойство, ще деактивира следните зависими свойства: {1} Продължаване?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Деактивирай свойство"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Да"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Не"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Нищо!</strong> Няма резултати от Вашето търсене."
diff --git a/Localization/bg-BG/OrchardCore.Flows.po b/Localization/bg-BG/OrchardCore.Flows.po
index aa014d9fa93f7..950756206bd54 100644
--- a/Localization/bg-BG/OrchardCore.Flows.po
+++ b/Localization/bg-BG/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Добави елемент"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Типовете съдържание, които тази \"торба\" може да съдържа, напр. Slide за Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Вмъкни Widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Изтрий"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Сигурен ли сте, че искате да премахнете този елемент?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/bg-BG/OrchardCore.Forms.po b/Localization/bg-BG/OrchardCore.Forms.po
index a277a0cd00e45..71ba66166d1a5 100644
--- a/Localization/bg-BG/OrchardCore.Forms.po
+++ b/Localization/bg-BG/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/bg-BG/OrchardCore.GitHub.po b/Localization/bg-BG/OrchardCore.GitHub.po
index 48b0e9f1aa7b6..827f197d96a50 100644
--- a/Localization/bg-BG/OrchardCore.GitHub.po
+++ b/Localization/bg-BG/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Настройки на GitHub Удостоверяване"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Дефинираното ID на клиента в основния таб на вашето <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub приложение</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Парола на вашето приложение."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/bg-BG/OrchardCore.Google.po b/Localization/bg-BG/OrchardCore.Google.po
index 24acd60918bac..7bbafd7c7eb5c 100644
--- a/Localization/bg-BG/OrchardCore.Google.po
+++ b/Localization/bg-BG/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Настройки на Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Настройки на Google Удостоверяване"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Клиентското id дефинирано в Google API конзолата за приложението."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Клиентският секретен ключ определен в Google API конзолата за приложението."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/bg-BG/OrchardCore.Html.po b/Localization/bg-BG/OrchardCore.Html.po
index b1bbb8031170b..54a8200cf8312 100644
--- a/Localization/bg-BG/OrchardCore.Html.po
+++ b/Localization/bg-BG/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg редактор"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Основната част на елемента със съдържание."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Въведи опции за редактора"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документация за опциите"
diff --git a/Localization/bg-BG/OrchardCore.Https.po b/Localization/bg-BG/OrchardCore.Https.po
index fd5126e6f577c..987bc65534b5d 100644
--- a/Localization/bg-BG/OrchardCore.Https.po
+++ b/Localization/bg-BG/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Определя дали постоянно пренасочване, 308 Moved Permanently, трябва да се използва вместо временно пренасочване, 307 Found, при пренасочване към HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/bg-BG/OrchardCore.Infrastructure.Abstractions.po b/Localization/bg-BG/OrchardCore.Infrastructure.Abstractions.po
index 1b6cebd4b099a..7a0ccfa6bf14c 100644
--- a/Localization/bg-BG/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/bg-BG/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/bg-BG/OrchardCore.Layers.po b/Localization/bg-BG/OrchardCore.Layers.po
index 19ce09595c578..959cdc07a65af 100644
--- a/Localization/bg-BG/OrchardCore.Layers.po
+++ b/Localization/bg-BG/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Създай слой"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Описание"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Редактирай слой - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Редактирай уиджетс и слоеве"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Успешно преместен уиджет. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Отмени</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Зони"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Моля<a href=\"{0}\">определи наличните зони</a> преди добавяне на уиджетс"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Добави Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Слоеве"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Избери слой, за показване на асоциираните уиджетс."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Редактирай"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Изтрий"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Моля<a href=\"{0}\">създай слой</a> преди добавяне на уиджетс"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Добави"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Ако е избрано, заглавието ще бъде визуализирано с уиджета."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Слоят, с който уиджета се асоциира."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/bg-BG/OrchardCore.Liquid.po b/Localization/bg-BG/OrchardCore.Liquid.po
index 16526e3a2b1d1..3ff7f1eeb619d 100644
--- a/Localization/bg-BG/OrchardCore.Liquid.po
+++ b/Localization/bg-BG/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/bg-BG/OrchardCore.Lists.po b/Localization/bg-BG/OrchardCore.Lists.po
index 3f0ea33ee04f3..8cf66e144a20b 100644
--- a/Localization/bg-BG/OrchardCore.Lists.po
+++ b/Localization/bg-BG/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/bg-BG/OrchardCore.Localization.po b/Localization/bg-BG/OrchardCore.Localization.po
index fa6765514d31a..16ed9578094c8 100644
--- a/Localization/bg-BG/OrchardCore.Localization.po
+++ b/Localization/bg-BG/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Култури"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Изисква се култура"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Активните култури конфигурирани за сайта."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Добави култура"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/bg-BG/OrchardCore.Markdown.po b/Localization/bg-BG/OrchardCore.Markdown.po
index 8a19fae1c9a14..3a33ecaf85d63 100644
--- a/Localization/bg-BG/OrchardCore.Markdown.po
+++ b/Localization/bg-BG/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg редактор"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg редактор"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/bg-BG/OrchardCore.Media.po b/Localization/bg-BG/OrchardCore.Media.po
index cede13696ec80..7b4bc4e1f860e 100644
--- a/Localization/bg-BG/OrchardCore.Media.po
+++ b/Localization/bg-BG/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/bg-BG/OrchardCore.Menu.po b/Localization/bg-BG/OrchardCore.Menu.po
index 384b157f96566..2bc9d706166f1 100644
--- a/Localization/bg-BG/OrchardCore.Menu.po
+++ b/Localization/bg-BG/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Менюта"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Редактиране на {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/bg-BG/OrchardCore.Microsoft.Authentication.po b/Localization/bg-BG/OrchardCore.Microsoft.Authentication.po
index f84cc1ef69118..7fbd92782aeea 100644
--- a/Localization/bg-BG/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/bg-BG/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/bg-BG/OrchardCore.Navigation.po b/Localization/bg-BG/OrchardCore.Navigation.po
index 01236a5a29df6..e60365597924b 100644
--- a/Localization/bg-BG/OrchardCore.Navigation.po
+++ b/Localization/bg-BG/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/bg-BG/OrchardCore.Notifications.po b/Localization/bg-BG/OrchardCore.Notifications.po
index 5cd57f1c0a52b..627c67cef885b 100644
--- a/Localization/bg-BG/OrchardCore.Notifications.po
+++ b/Localization/bg-BG/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/bg-BG/OrchardCore.OpenId.po b/Localization/bg-BG/OrchardCore.OpenId.po
index 4a956a27eb0da..da31baeee4781 100644
--- a/Localization/bg-BG/OrchardCore.OpenId.po
+++ b/Localization/bg-BG/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/bg-BG/OrchardCore.Placements.po b/Localization/bg-BG/OrchardCore.Placements.po
index 53e4a27b35fed..6a23140223684 100644
--- a/Localization/bg-BG/OrchardCore.Placements.po
+++ b/Localization/bg-BG/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/bg-BG/OrchardCore.ProjectTemplates.po b/Localization/bg-BG/OrchardCore.ProjectTemplates.po
index ddec4c182a65b..946a828bb4218 100644
--- a/Localization/bg-BG/OrchardCore.ProjectTemplates.po
+++ b/Localization/bg-BG/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Покажи"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/bg-BG/OrchardCore.PublishLater.po b/Localization/bg-BG/OrchardCore.PublishLater.po
index 2edf12ac82d64..9a7b4ef4d3c20 100644
--- a/Localization/bg-BG/OrchardCore.PublishLater.po
+++ b/Localization/bg-BG/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Публикувай по-късно"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Отмяна публикуването по-късно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/bg-BG/OrchardCore.Queries.po b/Localization/bg-BG/OrchardCore.Queries.po
index 04f6d20bdb3f1..26aed57fa826f 100644
--- a/Localization/bg-BG/OrchardCore.Queries.po
+++ b/Localization/bg-BG/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/bg-BG/OrchardCore.ReCaptcha.Core.po b/Localization/bg-BG/OrchardCore.ReCaptcha.Core.po
index ff7cfeffad333..bd1470f45054d 100644
--- a/Localization/bg-BG/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/bg-BG/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Неуспешна валидация на captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Неуспешна валидация на captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Език с име {0} не е намерен"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/bg-BG/OrchardCore.ReCaptcha.po b/Localization/bg-BG/OrchardCore.ReCaptcha.po
index d2b1b1b00a936..b6d612f159dc4 100644
--- a/Localization/bg-BG/OrchardCore.ReCaptcha.po
+++ b/Localization/bg-BG/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Експорт на ReCaptcha настройки."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Валидиране на ReCaptcha задачата"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Валидиране"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Валидно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Невалидно"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Captcha валидацията е неуспешна. Опитайте отново."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Настоящият подсайт ще бъде презареден след като настройките бъдат запазени."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Вашият Google's reCaptcha публичен ключ."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/bg-BG/OrchardCore.Recipes.Core.po b/Localization/bg-BG/OrchardCore.Recipes.Core.po
index 75578705b7f95..7ccf93f0a1440 100644
--- a/Localization/bg-BG/OrchardCore.Recipes.Core.po
+++ b/Localization/bg-BG/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/bg-BG/OrchardCore.Roles.po b/Localization/bg-BG/OrchardCore.Roles.po
index d28fc42c55153..4c8fbb51a6978 100644
--- a/Localization/bg-BG/OrchardCore.Roles.po
+++ b/Localization/bg-BG/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Роли"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Грешно име на роля."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Ролята е обновена успешно."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Не можете да изтриете системни роли."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Създай роля"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Име на роля"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Редактирай детайл на ролята"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Право"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Това право позволява на потребителя да повиши останалите си права. Прилагайте го с повишено внимание."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Отказ"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Роли"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/bg-BG/OrchardCore.Rules.po b/Localization/bg-BG/OrchardCore.Rules.po
index 65e78bf49b38e..5be1908585cbe 100644
--- a/Localization/bg-BG/OrchardCore.Rules.po
+++ b/Localization/bg-BG/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/bg-BG/OrchardCore.Search.Elasticsearch.po b/Localization/bg-BG/OrchardCore.Search.Elasticsearch.po
index e5129336efdf2..9bbd8cc2f2fc8 100644
--- a/Localization/bg-BG/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/bg-BG/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/bg-BG/OrchardCore.Search.Lucene.po b/Localization/bg-BG/OrchardCore.Search.Lucene.po
index 5b34663abd1bd..0014ee6659db5 100644
--- a/Localization/bg-BG/OrchardCore.Search.Lucene.po
+++ b/Localization/bg-BG/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/bg-BG/OrchardCore.Search.po b/Localization/bg-BG/OrchardCore.Search.po
index 59b1f48934d6b..d1f802b8ac467 100644
--- a/Localization/bg-BG/OrchardCore.Search.po
+++ b/Localization/bg-BG/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/bg-BG/OrchardCore.Security.po b/Localization/bg-BG/OrchardCore.Security.po
index a5407d7e4a08a..60c4378226a69 100644
--- a/Localization/bg-BG/OrchardCore.Security.po
+++ b/Localization/bg-BG/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/bg-BG/OrchardCore.Seo.po b/Localization/bg-BG/OrchardCore.Seo.po
index f0b58245904d8..1662a126ee91b 100644
--- a/Localization/bg-BG/OrchardCore.Seo.po
+++ b/Localization/bg-BG/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/bg-BG/OrchardCore.Settings.po b/Localization/bg-BG/OrchardCore.Settings.po
index 61d0a0dbacf9f..473ac1d607e0b 100644
--- a/Localization/bg-BG/OrchardCore.Settings.po
+++ b/Localization/bg-BG/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/bg-BG/OrchardCore.Setup.Core.po b/Localization/bg-BG/OrchardCore.Setup.Core.po
index a9d793980505d..b2d1593ca3a3d 100644
--- a/Localization/bg-BG/OrchardCore.Setup.Core.po
+++ b/Localization/bg-BG/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/bg-BG/OrchardCore.Setup.po b/Localization/bg-BG/OrchardCore.Setup.po
index d373f05e9350d..5100bcd23c1d3 100644
--- a/Localization/bg-BG/OrchardCore.Setup.po
+++ b/Localization/bg-BG/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Паролата трябва да съдържа най-малко {0} символи."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/bg-BG/OrchardCore.Shortcodes.po b/Localization/bg-BG/OrchardCore.Shortcodes.po
index bdcfaf66f904c..6b712876ece52 100644
--- a/Localization/bg-BG/OrchardCore.Shortcodes.po
+++ b/Localization/bg-BG/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/bg-BG/OrchardCore.Sitemaps.po b/Localization/bg-BG/OrchardCore.Sitemaps.po
index e374886b830b9..4805c02a66b2b 100644
--- a/Localization/bg-BG/OrchardCore.Sitemaps.po
+++ b/Localization/bg-BG/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/bg-BG/OrchardCore.Sms.po b/Localization/bg-BG/OrchardCore.Sms.po
index bdf3b14fcab14..80d8b09cc3257 100644
--- a/Localization/bg-BG/OrchardCore.Sms.po
+++ b/Localization/bg-BG/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-21 15:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/bg-BG/OrchardCore.Spatial.po b/Localization/bg-BG/OrchardCore.Spatial.po
index 1670c0b3140cf..688f863619b35 100644
--- a/Localization/bg-BG/OrchardCore.Spatial.po
+++ b/Localization/bg-BG/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/bg-BG/OrchardCore.Taxonomies.po b/Localization/bg-BG/OrchardCore.Taxonomies.po
index bcd9162fb3994..285c4a3ea8e1b 100644
--- a/Localization/bg-BG/OrchardCore.Taxonomies.po
+++ b/Localization/bg-BG/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Изисква се стойност за '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Тагове"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Категоризацията не може да бъде намерена. Моля проверете настройките за това поле."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Грешка при създаване на таг"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Пишете тук за търсене"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Избор"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Премахни"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Натиснете enter за създаване на таг"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Няма намерени тагове"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Тагове"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Категоризацията не може да бъде намерена. Моля проверете настройките за това поле."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказка, който ще се визуализира към полето на този редактор."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Категоризация"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Задължително"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Дали поне един елемент е избран."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Уникален"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Избор на поне един елемент."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Само разклоненията"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Само разклоненията да могат да се избират."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Да се създават нови тагове като вложени. Внимание: Създавайки вложени тагове, само показваният текст ще може да се определя."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Термин за съдържанието"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Добави {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Вие преорганизирахте класификацията."
diff --git a/Localization/bg-BG/OrchardCore.Templates.Cms.Module.po b/Localization/bg-BG/OrchardCore.Templates.Cms.Module.po
index cfaff2de92967..959a1b115c9a3 100644
--- a/Localization/bg-BG/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/bg-BG/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Покажи"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/bg-BG/OrchardCore.Templates.po b/Localization/bg-BG/OrchardCore.Templates.po
index be0036566b893..2f4ead062241f 100644
--- a/Localization/bg-BG/OrchardCore.Templates.po
+++ b/Localization/bg-BG/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/bg-BG/OrchardCore.Tenants.po b/Localization/bg-BG/OrchardCore.Tenants.po
index d33b1d9264e2b..63ccebbb77c23 100644
--- a/Localization/bg-BG/OrchardCore.Tenants.po
+++ b/Localization/bg-BG/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/bg-BG/OrchardCore.Tests.po b/Localization/bg-BG/OrchardCore.Tests.po
index 56ff5e9df8542..3b5708ce70fa0 100644
--- a/Localization/bg-BG/OrchardCore.Tests.po
+++ b/Localization/bg-BG/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/bg-BG/OrchardCore.Themes.po b/Localization/bg-BG/OrchardCore.Themes.po
index e7dbc88791f54..e577ef50d657a 100644
--- a/Localization/bg-BG/OrchardCore.Themes.po
+++ b/Localization/bg-BG/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Експорт на текущо избраната тема на сайта и тази на администрацията."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/bg-BG/OrchardCore.Title.po b/Localization/bg-BG/OrchardCore.Title.po
index 0ff7ceb9ce0cf..c0b724f21a5f5 100644
--- a/Localization/bg-BG/OrchardCore.Title.po
+++ b/Localization/bg-BG/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Моделът не съдържа валиден Liquid израз. Детайли: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Стандартен"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Избери, за да се визуализира заглавието."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/bg-BG/OrchardCore.Twitter.po b/Localization/bg-BG/OrchardCore.Twitter.po
index c5b2b8b153602..d89ca491b4fbf 100644
--- a/Localization/bg-BG/OrchardCore.Twitter.po
+++ b/Localization/bg-BG/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/bg-BG/OrchardCore.Users.Core.po b/Localization/bg-BG/OrchardCore.Users.Core.po
index 7175237ccb2a0..f305b2e4113d9 100644
--- a/Localization/bg-BG/OrchardCore.Users.Core.po
+++ b/Localization/bg-BG/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Имейл '{0}' е невалиден."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Неочаквана грешка: '{0}'."
diff --git a/Localization/bg-BG/OrchardCore.Users.po b/Localization/bg-BG/OrchardCore.Users.po
index acc7d2bae46d2..49c9609f44e8d 100644
--- a/Localization/bg-BG/OrchardCore.Users.po
+++ b/Localization/bg-BG/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Потребителят е създаден успешно"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Локалния вход е деактивиран."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Неуспешен опит за влизане."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Сайтът не позволява регистрация на потребители."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Потвърдете акаунта си"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Трябва да потвърдите новата си парола."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Име"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Имейл"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Одобрен"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Активен"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Деактивиране"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Изтрий"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Потребителят {0} е успешно одобрен."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Потребителят {0} е успешно изтрит."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Потребителят {0} е успешно деактивиран."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Потребителят {0} е успешно активиран."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Паролата е актуализирана коректно."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Новата парола и паролата за потвърждаване не съвпадат."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Задаване на Роли на Потребител"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Потребител"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Неуспешно"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Вход"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/bg-BG/OrchardCore.Widgets.po b/Localization/bg-BG/OrchardCore.Widgets.po
index 79ecbd8cd68c8..5c7468c9eb733 100644
--- a/Localization/bg-BG/OrchardCore.Widgets.po
+++ b/Localization/bg-BG/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Добави Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/bg-BG/OrchardCore.Workflows.po b/Localization/bg-BG/OrchardCore.Workflows.po
index 0442ace7ea097..707e7e4cc08f4 100644
--- a/Localization/bg-BG/OrchardCore.Workflows.po
+++ b/Localization/bg-BG/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-17 17:52\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/bg-BG/TheAdmin.po b/Localization/bg-BG/TheAdmin.po
index 427b0332e51aa..3a310c04ce309 100644
--- a/Localization/bg-BG/TheAdmin.po
+++ b/Localization/bg-BG/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Тъмен режим"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Отвори меню"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Изтрий"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Наистина ли искате да премахнете този елемент?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Добре"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Отказ"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/bg-BG/TheAgencyTheme.po b/Localization/bg-BG/TheAgencyTheme.po
index bf978721ffcf6..345bb74a375df 100644
--- a/Localization/bg-BG/TheAgencyTheme.po
+++ b/Localization/bg-BG/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Няма резултат от търсенето."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Страницата, която търсите не може да бъде намерена."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/bg-BG/TheBlogTheme.po b/Localization/bg-BG/TheBlogTheme.po
index 2d2c760cdfb40..6a6ba08c1dde2 100644
--- a/Localization/bg-BG/TheBlogTheme.po
+++ b/Localization/bg-BG/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "на {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Няма резултат от търсенето."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Страницата не е намерена"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/bg-BG/TheTheme.po b/Localization/bg-BG/TheTheme.po
index 3f465f5992ef9..732efcbe7a4be 100644
--- a/Localization/bg-BG/TheTheme.po
+++ b/Localization/bg-BG/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/cs/OrchardCore.Admin.po b/Localization/cs/OrchardCore.Admin.po
index 3b6dfb92e0ee3..bb4fd8ba7b237 100644
--- a/Localization/cs/OrchardCore.Admin.po
+++ b/Localization/cs/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Administrace"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Nastavení správce"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exportuje nastavení správce."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Vítejte v Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Prohlédněte si menu a objevte všechny možnosti."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Povolit tmavý režim administrace"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Zvolte, zda lze zobrazit tmavý režim administrace."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Zda jsou názvy zobrazeny v horním panelu."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Administrace"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/cs/OrchardCore.AdminDashboard.po b/Localization/cs/OrchardCore.AdminDashboard.po
index f3ba2e143f2a4..7ae17b6ba473a 100644
--- a/Localization/cs/OrchardCore.AdminDashboard.po
+++ b/Localization/cs/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Ne"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Pozice"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Šířka"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/cs/OrchardCore.AdminMenu.po b/Localization/cs/OrchardCore.AdminMenu.po
index cac130c973b69..8c457658c8579 100644
--- a/Localization/cs/OrchardCore.AdminMenu.po
+++ b/Localization/cs/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Vytvoření administračního menu {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Název"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Vytvořit položku menu"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Úprava administračního menu: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Název"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Upravit položku menu"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Priorita položky menu jenž určuje, která položka menu se zobrazí v případě, že více položek ukazuje na stejnou URL. Aktivní je položka s nejvyšší hodnotou priority."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Pořadí tohoto odkazu v administračním menu."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Odkaz"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Text odkazu, který se zobrazí v menu."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "URL odkazu. Odkaz se zobrazí pouze v případě, že položka menu nebo některá z jejích podpoložek má nastavené URL odkazu. URL je relativní vzhledem k URL administrace."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Vyberte ikonu"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Složka"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Text menu, který bude zobrazen v menu."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "Vybrat"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Vyberte ikonu, která se zobrazí v případě, že je položka umístěna v první úrovni menu."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Vyberte ikonu"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Oprávnění"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Začněte psát hledaný výraz"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Výběr z hodnot"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Odebrat"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Nenalezen žádný výsledek"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Oprávnění požadovaná pro zobrazení této položky nabídky (volitelné)."
diff --git a/Localization/cs/OrchardCore.Alias.po b/Localization/cs/OrchardCore.Alias.po
index d3ee32fe4f36d..a2afc73ec94ca 100644
--- a/Localization/cs/OrchardCore.Alias.po
+++ b/Localization/cs/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Předloha neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Ponechte prázdné, pro přegenerování."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Výchozí"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias je generován a nelze jej upravit"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/cs/OrchardCore.ArchiveLater.po b/Localization/cs/OrchardCore.ArchiveLater.po
index 0a6f6688343bf..134afbd59bdc1 100644
--- a/Localization/cs/OrchardCore.ArchiveLater.po
+++ b/Localization/cs/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/cs/OrchardCore.AuditTrail.po b/Localization/cs/OrchardCore.AuditTrail.po
index 815f2bee280c1..b1c9ba2e3f654 100644
--- a/Localization/cs/OrchardCore.AuditTrail.po
+++ b/Localization/cs/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Auditní stopa"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Všechny kategorie"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Vlastní časový rozsah"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Auditní stopa"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Zda je úloha odmazávání vypnutá."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Počet dní, kdy je událost zachována."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/cs/OrchardCore.Autoroute.po b/Localization/cs/OrchardCore.Autoroute.po
index a8ac9b6fb995a..d31d53a149353 100644
--- a/Localization/cs/OrchardCore.Autoroute.po
+++ b/Localization/cs/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Trvalý odkaz je příliš dlouhý. Maximální délka odkazu je {0} znaků."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Zaškrtněte pro vypnutí adresy této položky obsahu."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Zaškrtněte pro upřesnění, že položka podřízeného obsahu bude směrována na absolutní cestu."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/cs/OrchardCore.BackgroundTasks.po b/Localization/cs/OrchardCore.BackgroundTasks.po
index 2e813afd23f94..c9aca7412bc02 100644
--- a/Localization/cs/OrchardCore.BackgroundTasks.po
+++ b/Localization/cs/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-22 07:32\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Rozšířená nastavení"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Neplatná hodnota vypršení zámku v panelu rozšířených nastavení"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Ignorováno, pokud není zapnuta funkce distribuovaného uzamykání."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/cs/OrchardCore.ContentFields.po b/Localization/cs/OrchardCore.ContentFields.po
index 05d398e4342e9..cf30e7a499015 100644
--- a/Localization/cs/OrchardCore.ContentFields.po
+++ b/Localization/cs/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Přepínač"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy pro toto pole."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Žádné položky."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standardní"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nepublikováno"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Začněte psát hledaný výraz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Vybrat"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Odstranit"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenalezeny žádné výsledky"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Určuje zda může být vybráno více položek."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Zobrazit všechny typy obsahu"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Typy obsahu, které budou zobrazeny. Vyberte alespoň jeden."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy zobrazený pro toto pole."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Přeloženo"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy zobrazený pro toto pole."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "WYSIWYG editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Zadejte nastavení editoru, jazyk se při uložení vždy nastaví na `html`."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentace pro možnosti"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Určuje, zda je adresa URL použita při výběru z vložených médií (ve výchozím nastavení je vložen zkrácený kód)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentace pro možnosti"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Text odkazu"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Určuje zda je URL povinné."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Použít URL odkazu"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Text nápovědy pro pole URL."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Text nápovědy pro pole text."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Ukázková hodnota, která se zobrazí pokud je pole URL prázdné."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Ukázková hodnota, která se zobrazí pokud je pole text prázdné."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Výchozí URL předvyplněná při vytváření položky."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Žádné položky."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Standardní"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nepublikováno"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Zadejte hledaný výraz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Výběr z hodnot"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Odebrat"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenalezen žádný výsledek"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Určuje zda může být vybráno více položek."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Typy obsahu, které budou zobrazeny. Vyberte alespoň jeden."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Seznam zaškrtávacích polí"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Začněte psát hledaný výraz"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Výběr z hodnot"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Odebrat"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Nebyly nalezeny žádné hodnoty"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Upravit data"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON reprezentace povolených hodnot, např. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Rozsah"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Žádný"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Číselník"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy pro toto pole."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Ukázková hodnota, která se zobrazí, pokud je pole prázdné. (volitelné)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Počet číslic za desetinnou čárkou."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Minimální povolená hodnota. (volitelné)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Maximální povolená hodnota. (volitelné)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Zadejte možnosti editoru."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentace pro možnosti"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Upravit data"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON reprezentace povolených hodnot, např. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Storno"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy pro toto pole."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Pro sekundy použijte dělitel 60, např. \"15\", pro ms desetinné číslo rovné děliteli 1000 děleno 1000, např. \"0,250\"."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Žádní uživatelé"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Standardní"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Neaktivní"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Zadejte hledaný výraz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Výběr"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Odebrat"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Nenalezen žádný výsledek"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Určuje zda může být vybráno více položek."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Určuje, zda povolit výběr uživatele ze všech rolí."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy zobrazený pro toto pole."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Povinné"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje zda je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Nápověda"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy zobrazený pro toto pole."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Šířka"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Šířka okna s videem"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Výška"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Výška okna s videem"
diff --git a/Localization/cs/OrchardCore.ContentLocalization.po b/Localization/cs/OrchardCore.ContentLocalization.po
index d38b7e195d48f..9a565f01935dc 100644
--- a/Localization/cs/OrchardCore.ContentLocalization.po
+++ b/Localization/cs/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Nepodařilo se vytvořit lokalizovanou verzi položky."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/cs/OrchardCore.ContentPreview.po b/Localization/cs/OrchardCore.ContentPreview.po
index 7083742ea9253..ebeb418376158 100644
--- a/Localization/cs/OrchardCore.ContentPreview.po
+++ b/Localization/cs/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Předloha neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Náhled"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Náhled odpojen"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Chyba náhledu"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/cs/OrchardCore.ContentTypes.po b/Localization/cs/OrchardCore.ContentTypes.po
index a13ce67a355ce..a70ed3ac43ceb 100644
--- a/Localization/cs/OrchardCore.ContentTypes.po
+++ b/Localization/cs/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Bloky obsahu"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Název nemůže být prázdný."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Typ se stejným názvem již existuje."
@@ -66,10 +66,10 @@ msgstr "Typ se stejným názvem již existuje."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Technický název nemůže být prázdný."
@@ -78,10 +78,10 @@ msgstr "Technický název nemůže být prázdný."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Technický název musí začínat písmenem."
@@ -90,10 +90,10 @@ msgstr "Technický název musí začínat písmenem."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Technický název obsahuje neplatné znaky."
@@ -101,133 +101,133 @@ msgstr "Technický název obsahuje neplatné znaky."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "Technický název je vyhrazen pro interní použití."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Typ se stejným technickým názvem již existuje."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Typ obsahu \"{0}\" byl vytvořen."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Nastavení \"{0}\" bylo uloženo."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" byl odstraněn."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Blok \"{0}\" byl přidán."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Blok se stejným názvem již existuje."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Blok se stejným technickým názvem již existuje."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Blok \"{0}\" byl odstraněn."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Blok se nepodařilo vytvořit."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Blok \"{0}\" byl vytvořen."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Nastavení pro \"{0}\" bylo uloženo."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Pole se stejným názvem již existuje."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Pole se stejným technickým názvem již existuje."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Pole \"{0}\" bylo přidáno."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Název změněn na {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Nastavení pro pole \"{0}\" bylo uloženo."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Pole \"{0}\" bylo odstraněno."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Nastavení pro blok \"{0}\" bylo uloženo."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Název typu obsahu nemůže být prázdný."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Nelze přidat blok s názvem \"{0}\". Blok se stejným názvem již existuje."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Přidání nové pole do \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Název pole, který bude zobrazen při editaci obsahu."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Přidat pojmenovný blok do \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Název bloku, který bude zobrazen při editaci obsahu."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Technický název opakovaně použitelného bloku."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Exportuje zadaný typ obsahu a definice částí pro aktualizaci."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Technický název části."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Název bloku, který bude zobrazen při editeci obsahu. Ponechte prázdné, chcete-li použít výchozí nastavení."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Zaškrtněte, pokud chcete povolit připojit tento blok vícekrát."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Technický název typu."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Název typu, jak bude zobrazen na obrazovce."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Nový typ obsahu"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Název typu, který bude zobrazen při editaci obsahu."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Nový blok"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Vytvořit"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Čárkami oddělený seznam definic typů obsahu ke smazání"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Exportuje definovaný typ obsahu a definice částí pro smazání."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Upravit typ obsahu - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Pole"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Upravit"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Odstranit"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Režim zobrazení"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Přidat pole"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Bloky"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Obsahuje pole pro tento typ obsahu"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Přidat bloky"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Přidat pojmenovný blok"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Uložit"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Smazat"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "Nastavení \"{0}\" pro \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Název pole, který bude zobrazen při editaci obsahu."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Technický název pole."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Jaký typ editoru se má použít?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Jaký typ zobrazení se má použit?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Uložit"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Storno"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Některá nastavení, které jsou společná pro všechny typy lze také definovat na úrovni <a href=\"{0}\">definice bloku</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Název bloku, který bude zobrazen při editaci obsahu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Popis bloku, který bude zobrazen při editaci obsahu."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Jaký typ editoru se má použít?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Jaký typ zobrazení se má použit?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Uložit"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Storno"
diff --git a/Localization/cs/OrchardCore.Contents.po b/Localization/cs/OrchardCore.Contents.po
index 374a2a6b54916..0de18c823e214 100644
--- a/Localization/cs/OrchardCore.Contents.po
+++ b/Localization/cs/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "U položky {0} byla zrušena publikace."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Všechny typy obsahu"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Došlo k jedné nebo více chybám při validaci dat."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Export nastavení auditní stopy."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Obsah"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Hotovo"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Auditní stopa"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Zda se při úpravách zobrazí komentář k auditní stopě."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Datum, kdy byla položka vytvořena nebo poprvé publikována."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "a pokračovat"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Akce"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Obsah"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Návrh obsahu je uložen."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Položka obsahu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Zobrazit všechny typy obsahu"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Vyberte ikonu"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Zobrazit všechny typy obsahu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Omezit množství položek obsahu, které budou poskytnuty z tohoto zdroje. Poznámka: Pokud je vybrána tato volba, je možné vybrat pouze jeden typ obsahu."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Výchozí frekvence, s níž se tyto typy obsahu pravděpodobně změní."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Vše"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Jakýkoli typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Vytvořit obsah"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Zaškrtněte pokud chcete položku při vytvoření pulikovat. Ponechte odškrtnuté pro vytvoření konceptu."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Smaže obsah specifikovaný pomocí výrazu: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Zobrazit koncept jako JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Stáhnout návrh jako JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Zobrazit zveřejněné jako JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Stáhnout zvěřejněné jako JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Zobrazit jako JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Zrušit"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Nebyl nalezen žádný obsah pro plány nasazení. Vytvořte plán nasazení a přidejte obsah pomocí kroků nasazení."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Obsah"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Nový"
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publikuje obsah specifikovaný pomocí výrazu: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Získat obsah pomocí výrazu: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Zruší publikaci obsahu specifikovaného pomocí výrazu: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Aktualizovat obsah pomocí výrazu: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/cs/OrchardCore.CustomSettings.po b/Localization/cs/OrchardCore.CustomSettings.po
index 1f2a190198a58..b33c32e9f288a 100644
--- a/Localization/cs/OrchardCore.CustomSettings.po
+++ b/Localization/cs/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Vlastní nastavení"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Vše"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/cs/OrchardCore.Data.YesSql.po b/Localization/cs/OrchardCore.Data.YesSql.po
index b1f5723196f29..eeca63f51878e 100644
--- a/Localization/cs/OrchardCore.Data.YesSql.po
+++ b/Localization/cs/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/cs/OrchardCore.Demo.po b/Localization/cs/OrchardCore.Demo.po
index c762fb8d66650..7e21713ee9589 100644
--- a/Localization/cs/OrchardCore.Demo.po
+++ b/Localization/cs/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Jméno"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Příjmení"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/cs/OrchardCore.Deployment.Remote.po b/Localization/cs/OrchardCore.Deployment.Remote.po
index 7b6b0a84fd8f2..9c7659b567812 100644
--- a/Localization/cs/OrchardCore.Deployment.Remote.po
+++ b/Localization/cs/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Odešle plán nasazení na vzdálenou instanci."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Název klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Vytvořit vzdálenou instanci"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Název"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Název klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Upravit vzdáleného klienta"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Název klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Upravit vzdálenou instanci"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Název"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Název klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/cs/OrchardCore.Deployment.po b/Localization/cs/OrchardCore.Deployment.po
index 9d659cfcb2ab0..94abe8e49eab0 100644
--- a/Localization/cs/OrchardCore.Deployment.po
+++ b/Localization/cs/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Smazat"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Název je povinný."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Vytvořit plán nasazení"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Vlastní soubor, který se přidá jako součást plánu."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Název souboru, pod kterým bude soubor přidán do archivu."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Plány nasazení"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Vše"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Upravit plán nasazení"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/cs/OrchardCore.Diagnostics.po b/Localization/cs/OrchardCore.Diagnostics.po
index 0c98fd9e092dd..39580418ec872 100644
--- a/Localization/cs/OrchardCore.Diagnostics.po
+++ b/Localization/cs/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Váš prohlížeč odeslal požadavek, kterému tento server nerozumí."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Při zpracování tohoto požadavku nastala chyba."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Nemáte přístup k tomuto prostředku."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Stránka nebyla nalezena."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Nemáte oprávnění pro zobrazení této stránky."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/cs/OrchardCore.Email.Abstractions.po b/Localization/cs/OrchardCore.Email.Abstractions.po
index a297ff862c7ea..821f83303e7f5 100644
--- a/Localization/cs/OrchardCore.Email.Abstractions.po
+++ b/Localization/cs/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Pole {0} je povinné."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Metoda doručení '{0}' není podporována."
diff --git a/Localization/cs/OrchardCore.Email.po b/Localization/cs/OrchardCore.Email.po
index f36d93cb49ba5..03621a7f8d799 100644
--- a/Localization/cs/OrchardCore.Email.po
+++ b/Localization/cs/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Zasílání zpráv"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Selhalo"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Odeslat e-mail"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "E-mailová adresa určující od koho e-mail je. Ponechte prázdné pokud chcete použít nakonfigurovanou e-mailovou adres. Podporuje Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Čárkami oddělený seznam e-mailových adres příjemců. Podporuje Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Nastavení"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Komu"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Kopie"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Odpověď poslat na"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Předmět"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Tělo zprávy"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Po uložení změn bude tento web restartován."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Možnosti síťového doručení"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Doména SMTP serveru, např. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "SMTP port serveru, obvykle 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Uživatelské jméno pro autentizaci."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Nastavení pro doručování do vybraného adresáře"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Např. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> pro ukládání e-mailů do složky <i>PickedUpEmail</i> na disku C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/cs/OrchardCore.Facebook.po b/Localization/cs/OrchardCore.Facebook.po
index 46c00cd1c36d2..92f1d912e3c1d 100644
--- a/Localization/cs/OrchardCore.Facebook.po
+++ b/Localization/cs/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Nastavení přihlášení"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "URL v rámci aplikace, kam bude uživatel přesměrován a kde aplikace zpracuje požadavek na přihášení."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Šablona pluginu, v Liquid formátu."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Javascript SDK Verze"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Načíst na každé stránce"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/cs/OrchardCore.Features.po b/Localization/cs/OrchardCore.Features.po
index 902d40d838009..06141ef035738 100644
--- a/Localization/cs/OrchardCore.Features.po
+++ b/Localization/cs/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funkce"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Vyberte jedenu nebo více funkcí."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} byl {1}."
@@ -125,9 +125,9 @@ msgstr "Hromadné akce"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Zakázat"
@@ -136,8 +136,8 @@ msgstr "Zakázat"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Povolit"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Nezařazené"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Zakázání funkce {0} zakáže také další funkce, které na ní závisí: {1}. Chcete pokračovat?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Zakázat funkci"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Ano"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Ne"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Nenalezeno!</strong> Vaše vyhledáváníí nevrátilo žádné výsledky."
diff --git a/Localization/cs/OrchardCore.Flows.po b/Localization/cs/OrchardCore.Flows.po
index 95dcd25d94d28..8264a5c764948 100644
--- a/Localization/cs/OrchardCore.Flows.po
+++ b/Localization/cs/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Přidat položku"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Typy obsahu, které může tento bag obsahovat, například Snímek pro Prezentaci."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/cs/OrchardCore.Forms.po b/Localization/cs/OrchardCore.Forms.po
index d1be372975ef9..63b9fc07a67c9 100644
--- a/Localization/cs/OrchardCore.Forms.po
+++ b/Localization/cs/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validace"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validace"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validace"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Platné"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Neplatné"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validace"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Platné"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Neplatné"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validace"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Platné"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Neplatné"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Název pole formuláře, který má neplatnou hodnotu."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Sváže odeslané formulářové prvky a model formuláře."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Text zobrazený v tlačítku."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Typ tlačítka."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "ID tohoto formulářového prvku."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Název tohoto formulářového prvku."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "URL, kam se formulář odešlete."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "HTTP metoda použitá při odeslání formuláře."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Typ tlačítka."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Text, který se zobrazí pokud pole nemá žádnou hodnotu."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Výchozí hodnota pro toto pole."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Text, který se zobrazí pokud pole nemá žádnou hodnotu."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Validovat <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Název pole formuláře pro validaci."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Kontroluje, zda odeslaný formulář neobsahuje nějaké chyby."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/cs/OrchardCore.GitHub.po b/Localization/cs/OrchardCore.GitHub.po
index b2b9d06e43bab..3ac0f48782e2c 100644
--- a/Localization/cs/OrchardCore.GitHub.po
+++ b/Localization/cs/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Nastavení přihlášení pro GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Client ID zadané v hlavní kartě <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub Aplikace</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/cs/OrchardCore.Google.po b/Localization/cs/OrchardCore.Google.po
index 6afd1f61d56fa..16861e6c47360 100644
--- a/Localization/cs/OrchardCore.Google.po
+++ b/Localization/cs/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Nastavení Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Nastavení Google autentizace"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "ID klienta definované v rozhraní Google API console pro příslušnou aplikaci."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Client secret definované v rozhraní Google API console pro příslušnou aplikaci."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/cs/OrchardCore.Html.po b/Localization/cs/OrchardCore.Html.po
index 8236bedd7b23d..9b60c1b678819 100644
--- a/Localization/cs/OrchardCore.Html.po
+++ b/Localization/cs/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "WYSIWYG editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Tělo položky obsahu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/cs/OrchardCore.Https.po b/Localization/cs/OrchardCore.Https.po
index 63f8149901440..fb5a21cab865d 100644
--- a/Localization/cs/OrchardCore.Https.po
+++ b/Localization/cs/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Určuje u HTTPS přesměrování, zda by mělo být permanentní přesměrování (308 Přesunuto trvale) použito místo dočasného přesměrování (307 Nalezeno)"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/cs/OrchardCore.Infrastructure.Abstractions.po b/Localization/cs/OrchardCore.Infrastructure.Abstractions.po
index 1139d189b48f5..67002c915aab6 100644
--- a/Localization/cs/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/cs/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/cs/OrchardCore.Layers.po b/Localization/cs/OrchardCore.Layers.po
index bebc5df21d23b..a057ac2b8173f 100644
--- a/Localization/cs/OrchardCore.Layers.po
+++ b/Localization/cs/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Vytvořit vrstvu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Název"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Popis"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Upravit vrstvu - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Název"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "Chyba při aktualizaci pořadí pravidel"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Uložit"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Upravit widgety a vrstvy"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget úspěšně přesunut. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Zpět</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zóny"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Před vkládáním widgetů <a href=\"{0}\">definujte dostupné zóny</a>"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Přidat widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Vrstvy"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Pro zobrazení svázaných widgetů vyberte vrstvu."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Viz dokumentaci"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Upravit"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Smazat"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Před vkládáním widgetů <a href=\"{0}\">vytvořte vrstvu</a>"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Přidat"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Je-li zaškrtnuto, název bude vykreslen společně s widgetem."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Vrstva, se kterou má být widget svázán."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/cs/OrchardCore.Liquid.po b/Localization/cs/OrchardCore.Liquid.po
index 9b11d059ebe0c..8a9a728931d23 100644
--- a/Localization/cs/OrchardCore.Liquid.po
+++ b/Localization/cs/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/cs/OrchardCore.Lists.po b/Localization/cs/OrchardCore.Lists.po
index 647ef9b048e5e..f556fa018d6a4 100644
--- a/Localization/cs/OrchardCore.Lists.po
+++ b/Localization/cs/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Reprezentuje odkaz na nadřazenou položku obsahu a její pořadí."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Reprezentuje seznam položek obsahu."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Zadaný BlogPost již neexistuje. Prosím, vytvořte nový."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Nemáte smazat tento obsah"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Uživatelské jméno, e-mail nebo heslo nejsou správné."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Seznam je prázdný"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Seznamy"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Přidat nadřazenou položku menu"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/cs/OrchardCore.Localization.po b/Localization/cs/OrchardCore.Localization.po
index e107a3bf1aae2..eb8c2be34f338 100644
--- a/Localization/cs/OrchardCore.Localization.po
+++ b/Localization/cs/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Jazyková verze"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Jazyková verze je vyžadována"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Pro aplikaci nastavení byl web restartován."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Aktivní verze jazykových kultur pro stránku."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Místní nastavení"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Exportuje místní nastavení."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Přidat jazykovou verzi"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/cs/OrchardCore.Markdown.po b/Localization/cs/OrchardCore.Markdown.po
index f25d5849891ad..87933755ffd2e 100644
--- a/Localization/cs/OrchardCore.Markdown.po
+++ b/Localization/cs/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "WYSIWYG editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Tělo položky obsahu ve formátu Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "WYSIWYG editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Standardní"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/cs/OrchardCore.Media.po b/Localization/cs/OrchardCore.Media.po
index 278cd65d85d2f..ee59e8349a9f1 100644
--- a/Localization/cs/OrchardCore.Media.po
+++ b/Localization/cs/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Soubor nelze přesunout protože v cílovém adresáři již existuje soubor se stejným názvem"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Invertovat"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Vytvořit složku"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Přejmenovat položku"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Média"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Vše"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr "Exportuje všechny nebo jen vybrané soubory."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Výběr médií"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Storno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/cs/OrchardCore.Menu.po b/Localization/cs/OrchardCore.Menu.po
index d9743586515db..b98a144b8edff 100644
--- a/Localization/cs/OrchardCore.Menu.po
+++ b/Localization/cs/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menu"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Položka menu byla úspěšně smazána."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Upravit {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Název"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Viz dokumentaci"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Název"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/cs/OrchardCore.Microsoft.Authentication.po b/Localization/cs/OrchardCore.Microsoft.Authentication.po
index cf32292c62a89..6f22a1ae94e73 100644
--- a/Localization/cs/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/cs/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Nastavení autentizace Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "ID aplikace z portálu Microsoft pro vývojáře."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Secret key aplikace z portálu Microsoft pro vývojáře."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/cs/OrchardCore.Navigation.po b/Localization/cs/OrchardCore.Navigation.po
index f6891263fab12..210211279b5e3 100644
--- a/Localization/cs/OrchardCore.Navigation.po
+++ b/Localization/cs/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/cs/OrchardCore.Notifications.po b/Localization/cs/OrchardCore.Notifications.po
index 0e7b650e47dcc..96df4823f644f 100644
--- a/Localization/cs/OrchardCore.Notifications.po
+++ b/Localization/cs/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/cs/OrchardCore.OpenId.po b/Localization/cs/OrchardCore.OpenId.po
index efcc71c1342a4..17876f1dea876 100644
--- a/Localization/cs/OrchardCore.OpenId.po
+++ b/Localization/cs/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Jméno"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Tajný klíč klienta"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Jméno"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "vidět: "
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Tajný klíč klienta"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/cs/OrchardCore.Placements.po b/Localization/cs/OrchardCore.Placements.po
index 9da64c71f777f..9a4d8320a5761 100644
--- a/Localization/cs/OrchardCore.Placements.po
+++ b/Localization/cs/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/cs/OrchardCore.ProjectTemplates.po b/Localization/cs/OrchardCore.ProjectTemplates.po
index ed7eb2df659f2..3981585d35046 100644
--- a/Localization/cs/OrchardCore.ProjectTemplates.po
+++ b/Localization/cs/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Zobrazit"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/cs/OrchardCore.PublishLater.po b/Localization/cs/OrchardCore.PublishLater.po
index 085b288935fba..dc7ef2b53ea7c 100644
--- a/Localization/cs/OrchardCore.PublishLater.po
+++ b/Localization/cs/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publikovat později"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Zrušit publikování později"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/cs/OrchardCore.Queries.po b/Localization/cs/OrchardCore.Queries.po
index 1699769775896..80c47a8127e77 100644
--- a/Localization/cs/OrchardCore.Queries.po
+++ b/Localization/cs/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL dotaz"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "Dotaz SQL používá standardní syntaxi SQL92 a interpretován na základě používané databáze. Názvy tabulek budou prefixem označeny automaticky."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Storno"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Technický název dotazu."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Pokud je zaškrtnuto, dotaz musí vracet seznam ID položek obsahu."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/cs/OrchardCore.ReCaptcha.Core.po b/Localization/cs/OrchardCore.ReCaptcha.Core.po
index ce6e82e7082e8..ff0232cd36961 100644
--- a/Localization/cs/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/cs/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Nepodařilo se ověřit zadaný kód"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Nepodařilo se ověřit zadaný kód"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Jazyk s názvem {0} nebyl nalezen"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/cs/OrchardCore.ReCaptcha.po b/Localization/cs/OrchardCore.ReCaptcha.po
index 59d98f712bb43..eaf98cef0933c 100644
--- a/Localization/cs/OrchardCore.ReCaptcha.po
+++ b/Localization/cs/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validace"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Platné"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Neplatné"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Ověření kód se nezdařilo. Zkuste to znovu."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Po uložení změn bude tento web restartován."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Vaš klíč stránky v Google reCaptcha."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/cs/OrchardCore.Recipes.Core.po b/Localization/cs/OrchardCore.Recipes.Core.po
index 2387636e9105c..03c350624e6e8 100644
--- a/Localization/cs/OrchardCore.Recipes.Core.po
+++ b/Localization/cs/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/cs/OrchardCore.Roles.po b/Localization/cs/OrchardCore.Roles.po
index dc5e6da917aba..ec99b7e232681 100644
--- a/Localization/cs/OrchardCore.Roles.po
+++ b/Localization/cs/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Role"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Neplatný název role."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Role byla úspěšně aktualizována."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Nelze odstranit systémové role."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Vytvořit roli"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Název role"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Upravit podrobnosti role"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Oprávnění"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Toto oprávnění by mohlo uživateli umožnit zvýšit jejich další oprávnění. Udělujte jej s velkou úvahou."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Storno"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Role"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/cs/OrchardCore.Rules.po b/Localization/cs/OrchardCore.Rules.po
index 127478afb96fd..6b268655abdde 100644
--- a/Localization/cs/OrchardCore.Rules.po
+++ b/Localization/cs/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Vše"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Jakékoliv"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Přidat"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "Typ obsahu"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "Vyberte operátor pro pravidlo."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Jazyková verze"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Vyberte operátor pro podmínku."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr "JavaScript"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Vyberte operátor pro podmínku."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Vyberte operátor pro podmínku."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/cs/OrchardCore.Search.Elasticsearch.po b/Localization/cs/OrchardCore.Search.Elasticsearch.po
index d50a0a4fb5f60..c7b19b1c0bfed 100644
--- a/Localization/cs/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/cs/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/cs/OrchardCore.Search.Lucene.po b/Localization/cs/OrchardCore.Search.Lucene.po
index 74d3b3dcce402..da6f7e3b893f5 100644
--- a/Localization/cs/OrchardCore.Search.Lucene.po
+++ b/Localization/cs/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/cs/OrchardCore.Search.po b/Localization/cs/OrchardCore.Search.po
index bbefa727d73fd..357701c7eb938 100644
--- a/Localization/cs/OrchardCore.Search.po
+++ b/Localization/cs/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/cs/OrchardCore.Security.po b/Localization/cs/OrchardCore.Security.po
index b931a719bf2d2..94869868259f1 100644
--- a/Localization/cs/OrchardCore.Security.po
+++ b/Localization/cs/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/cs/OrchardCore.Seo.po b/Localization/cs/OrchardCore.Seo.po
index 0c0e4394bf9c9..47967600c1538 100644
--- a/Localization/cs/OrchardCore.Seo.po
+++ b/Localization/cs/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/cs/OrchardCore.Settings.po b/Localization/cs/OrchardCore.Settings.po
index 503084a60cb8e..501913a46ffa7 100644
--- a/Localization/cs/OrchardCore.Settings.po
+++ b/Localization/cs/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Nastavení webu bylo aktualizováno."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Základní URL adresa musí být zadaná celá."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Nastavení webu"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/cs/OrchardCore.Setup.Core.po b/Localization/cs/OrchardCore.Setup.Core.po
index cc6b20b8fa535..09b9b9f6a04d9 100644
--- a/Localization/cs/OrchardCore.Setup.Core.po
+++ b/Localization/cs/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/cs/OrchardCore.Setup.po b/Localization/cs/OrchardCore.Setup.po
index 0713baa98c6f4..8ec847e7be9dc 100644
--- a/Localization/cs/OrchardCore.Setup.po
+++ b/Localization/cs/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Heslo musí obsahovat alespoň {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Není možné instalovat web bez receptu."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Používá se jako výchozí titulek vašich stránek."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Recepty vám umožňují vytvořit váš web s přednastavenými funkcemi, možnostmi a nastavením."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Určuje výchozí časové pásmo používané při zobrazení a úpravě datumů a časů."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Databáze se používá k ukládání konfigurace webu a jeho obsahu."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Můžete zadat prefix tabulky, pokud máte v úmyslu použít stejnou databázi pro více stránek (webů)."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Zobrazit/skrýt connection string"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Superadmin má všechna práva. Měl by se používat pouze během instalace a pro zotavení po havárii."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "E-mail je neplatný."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Síla hesla"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/cs/OrchardCore.Shortcodes.po b/Localization/cs/OrchardCore.Shortcodes.po
index 5375907d6326f..705d452a1c367 100644
--- a/Localization/cs/OrchardCore.Shortcodes.po
+++ b/Localization/cs/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/cs/OrchardCore.Sitemaps.po b/Localization/cs/OrchardCore.Sitemaps.po
index 6ceea0cc408de..51b4ec2256af5 100644
--- a/Localization/cs/OrchardCore.Sitemaps.po
+++ b/Localization/cs/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/cs/OrchardCore.Sms.po b/Localization/cs/OrchardCore.Sms.po
index 0cf1a54b91160..c1e2e35038e8a 100644
--- a/Localization/cs/OrchardCore.Sms.po
+++ b/Localization/cs/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-21 15:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/cs/OrchardCore.Spatial.po b/Localization/cs/OrchardCore.Spatial.po
index c2ad65e65e274..b43f58b45eed1 100644
--- a/Localization/cs/OrchardCore.Spatial.po
+++ b/Localization/cs/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/cs/OrchardCore.Taxonomies.po b/Localization/cs/OrchardCore.Taxonomies.po
index a1f60bafc2258..5299e5778799d 100644
--- a/Localization/cs/OrchardCore.Taxonomies.po
+++ b/Localization/cs/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Pro '{0} ' je vyžadována hodnota"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Filtry taxonomie"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Štítky"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taxonomie nebyla nalezena. Prosím zkontrolujte nastavení pro toto pole."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Chyba při vytváření štítku"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Začněte psát hledaný výraz"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Výběr z hodnot"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Odebrat"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Stiskněte enter pro vytvoření štítku"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Nebyly nalezeny žádné štítky"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Štítky"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Výchozí"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taxonomie nebyla nalezena. Prosím zkontrolujte nastavení pro toto pole."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Výchozí"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovědy zobrazený pro toto pole."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonomie"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Povinné"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Určuje zda musí být vybrána minimálně jedna položka."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unikátní"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Určuje zda musí být vybrána právě jedna položka."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Pouze listy"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Určuje zda mohou být vybrány pouze listy taxonomie (položky bez dalších podpoložek)."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Určuje, zda mohou být nové štítky vytvořeny inline. Poznámka: při vytváření štítků vložených do řádku bude nastavena pouze vlastnost textového výrazu."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Typ obsahu pro pojem"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Přidat {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Změnili jste pořadí pojmů v taxonomii."
diff --git a/Localization/cs/OrchardCore.Templates.Cms.Module.po b/Localization/cs/OrchardCore.Templates.Cms.Module.po
index 3292ea6a2358a..cab337fd2ad9c 100644
--- a/Localization/cs/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/cs/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Zobrazit"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/cs/OrchardCore.Templates.po b/Localization/cs/OrchardCore.Templates.po
index db87503bbbe7e..f8d0f771fab91 100644
--- a/Localization/cs/OrchardCore.Templates.po
+++ b/Localization/cs/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Byla vytvořena šablona \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Šablona byla úspěšně odstraněna."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Šablony byly úspěšně odstraněny."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "Všechny šablony"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Náhled"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Název šablony."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Popis šablony."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Náhled"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Název šablony."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Popis šablony."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/cs/OrchardCore.Tenants.po b/Localization/cs/OrchardCore.Tenants.po
index e30dec8809f1e..d2a62446bf8dd 100644
--- a/Localization/cs/OrchardCore.Tenants.po
+++ b/Localization/cs/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Weby"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "Vše"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Všechny stavy"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Spuštěno"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Název"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Stav"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Nelze zakázat výchozí web."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Web \"{0}\" je již zakázán."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Web \"{0}\" je již povolen."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Můžete pouze povolit zakázaný web."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "E-mailová adresa je neplatná."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Web nalezen: \"{0}\""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Web se nepodařilo inicializovat."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Databázi se nepodařilo inicializovat."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Pro toto datové úložiště je connection string povinný."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Je nutné zadat \"Recept\" nebo \"RecipeName\"."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Recept '{0}' nebyl nalezen."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Vytvořit web"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Upravit web"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/cs/OrchardCore.Tests.po b/Localization/cs/OrchardCore.Tests.po
index 5b5082a67408a..c4c2dbe080908 100644
--- a/Localization/cs/OrchardCore.Tests.po
+++ b/Localization/cs/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/cs/OrchardCore.Themes.po b/Localization/cs/OrchardCore.Themes.po
index f4f0376cf04d5..a2b04371dbb2a 100644
--- a/Localization/cs/OrchardCore.Themes.po
+++ b/Localization/cs/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exportuje aktuálně vybraný motiv stránky a administrace."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/cs/OrchardCore.Title.po b/Localization/cs/OrchardCore.Title.po
index 339e33762bc03..832388842fdc8 100644
--- a/Localization/cs/OrchardCore.Title.po
+++ b/Localization/cs/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Pro název je vyžadována hodnota."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Vzor neobsahuje platný Liquid výraz. Podrobnosti: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Výchozí"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Název bude automaticky generován pomocí vzoru."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Výchozí"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Zaškrtněte pro zobrazení názvu v zobrazení."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/cs/OrchardCore.Twitter.po b/Localization/cs/OrchardCore.Twitter.po
index 5e0773fa59011..64076c2fb4dfd 100644
--- a/Localization/cs/OrchardCore.Twitter.po
+++ b/Localization/cs/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Sociální"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Neúspěšné"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Nastavení integrace Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API klíč"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Privátní klíč API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Přístupový token"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Nastavení přihlíšení pomocí Twitteru"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Aktualizovat stav na Twitteru"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/cs/OrchardCore.Users.Core.po b/Localization/cs/OrchardCore.Users.Core.po
index 0920ab5d9bd09..8474a8af50c42 100644
--- a/Localization/cs/OrchardCore.Users.Core.po
+++ b/Localization/cs/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-mail '{0}' je neplatný."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Neočekávaná chyba: '{0}'."
diff --git a/Localization/cs/OrchardCore.Users.po b/Localization/cs/OrchardCore.Users.po
index 3ee357d7e69f4..da41fb3104eba 100644
--- a/Localization/cs/OrchardCore.Users.po
+++ b/Localization/cs/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Uživatel byl úspěšně vytvořen"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Místní přihlášení je zakázáno."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Účet je uzamčen"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Neplatný pokus o přihlášení."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Vaše heslo bylo úspěšně změněno."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "U externího poskytovatele došlo k chybě."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Web neumožňuje registraci uživatelů."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Potvrďte svůj účet"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Zadaný uživatel není oprávněn se přihlásit."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Potvrďte prosím svůj e-mail."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Všichni uživatelé"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Povolení uživatelé"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Zakázaní uživatelé"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Jméno"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "E-mail"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Schválit"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Povolit"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Zakázat"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Odstranit"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Všechny role"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Ověřeno (bez rolí)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Uživatel {0} byl úspěšně schválen."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Uživatel {0} byl úspěšně smazán."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Uživatel {0} byl úspěšně zakázán."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Uživatel {0} byl úspěšně povolen."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Uživatel byl úspěšně vytvořen."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Uživatel byl úspěšně aktualizován."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Uživatel byl úspěšně smazán."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Uživatele nelze odstranit."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Heslo bylo úspěšně nastaveno."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Uživatel byl úspěšně odemčen."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Nepodařilo se odemknout uživatele."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "Nelze aktualizovat své vlastní role."
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Nastavení přihlášení"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exportuje nastavení přihlášení."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Změnit nastavení e-mailu"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exportuje nastavení změny e-mailu."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Nastavení registrace"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exportuje nastavení registrace."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Obnovit nastavení hesla"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exportuje nastavení obnovení hesla."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Nové heslo a potvrzovací heslo se neshodují."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Přiřadit uživatelskou roli"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Uživatel"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Neúspěch"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Registrovat uživatele"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Uživatel"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Platný"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Neplatný"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Žádná e-mailová služba není k dispozici"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Uživatel aktualizován"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Uživatel"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Ověřit uživatele"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonymní"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Ověření"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Členové role"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Pole {0} je povinné."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} do role {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Uživatel k přiřazení. S podporou Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Současné heslo"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nové heslo"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Vytvořit uživatele"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Změnit heslo"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nové heslo"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Pro obnovení hesla si prosím zkontrolujte svůj e-mail."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Změnit e-mail"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Úspěšně jste se ověřili jako <strong>{0}</strong>. Již máte účet s touto e-mailovou adresou. Zadejte heslo k lokálnímu účtu a klikněte na tlačítko Registrovat pro propojení účtů a dokončení přihlášení."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "E-mail"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Přihlásit se"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "K přihlášení použijte jinou službu"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Přihlaste se pomocí svého účtu {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Vytvořit nový účet."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "E-mail"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Heslo"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Úspěšně jste se ověřili jako <strong>{0}</strong>. Vyplňte prosím formulář níže a klikněte na tlačítko Registrovat pro dokončení registrace."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "E-mail"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Heslo"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Odeslat ověřovací e-mail"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Předmět zprávy. Podporuje syntaxi Liquid."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Domů"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Obnovit heslo"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "E-mail"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nové heslo"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Uživatel deaktivován."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Uživatel je aktivní."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Odškrtněte pro zakázání tohoto uživatelského účtu."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Storno"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,17 +3518,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Role"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Výsledek 'InRole' bude spuštěn, pokud uživatel má alespoň jednu z vybraných rolí."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/cs/OrchardCore.Widgets.po b/Localization/cs/OrchardCore.Widgets.po
index 47f582ec22d1e..4b6dfb9595149 100644
--- a/Localization/cs/OrchardCore.Widgets.po
+++ b/Localization/cs/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Přidat widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/cs/OrchardCore.Workflows.po b/Localization/cs/OrchardCore.Workflows.po
index 32b35d43faa19..89bb2fe2eb629 100644
--- a/Localization/cs/OrchardCore.Workflows.po
+++ b/Localization/cs/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Základní prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Opakovat"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Opakovat"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Pravda"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Nepravda"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Sloučeno"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Základní prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Hotovo"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Výjimky"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Základní prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Základní prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Řídící struktura"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Opakovat"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Hotovo"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Nedávno vytvořené"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Workflow {0} bylo odstraněno."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Workflow {0} bylo odstraněno."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Hotovo"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Shoduje se"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Neošetřený HTTP status"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Hotovo"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Úvodní akce"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Upravit"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Přidat"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Porovnat"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Zpět"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Smazat"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Dostupné události"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Dostupné akce"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Opravdu chcete smazat tuto akci?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtrovat"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Opakovat pro <em>{0}</em> z <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Seznam, přes který se má iterovat. S podporou JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Žádně větve"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Iterovat <em>{0}</em> od <em>{1}</em> do <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Počáteční hodnota. S podporou JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Koncová hodnota. S podporou JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Krok cyklu. S podporou JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Přesměrování HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "URL pro přesměrování. S podporou Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Trvalé"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Zaškrtněte pokud má být přesměrování trvalé (301). Nechte nezaškrtnuté pokud má být přesměrování dočasné (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Zpracovat příchozí požadavek HTTP"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Kdokoli, kdo přistoupí na tuto URL, spustí tento workflow. Uchovávejte ji na bezpečném místě."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Ověřit Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Odškrtněte pokud workflow slouží ke zpracování požadavků ze služby, která používá tuto URL jako webhook. Pokud URL slouží ke zpracování požadavků z webového formuláře, ponechte zaškrtnuté. Ověříte tím, že obsah formuláře nebyl podvrhnutý."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Platnost tokenu"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Po změně této hodnoty stiskněte tlačítko <b>Regenerovat</b>."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Počet dnů do vypršení platnosti tokenu. 0 pro token, který nikdy nevyprší"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Filtrovat příchozí HTTP požadavek"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "HTTP metoda."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Název controlleru."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Název akce."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "URL pro odeslání požadavku. Podporuje syntaxi Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "HTTP methoda. Například: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Content type těla požadavku."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Tělo HTTP požadavku pro metody POST, PUT a PATCH. S podporou Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Zadejte další HTTP hlavičky, každý pár klíč/hodnota na nový řádek. Příklad: \"X-MyHeader: Foo\". S podporou Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP odpověď"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Stavový kód odpovědi. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Zobrazit kompletní seznam</a>."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Content type těla odpovědi."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Tělo odpovědi. S podporou Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Vyhodnotit <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Smazat"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Vytvořeno {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Nic tu není!</strong> V tuto chvíli neexistují žádné pozastavené workflow."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Zpět"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] "{0} instance"
-msgstr[2] "{0} instancí"
-msgstr[3] "{0} instancí"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Čekat na <strong>jakoukoli</strong> příchozí větv před spojením do jedné větve."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Úrovně logu."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} upozornění"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Typ oznámení."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Skript"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Čárkami oddělený seznam dostupných výstupů."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Výstup přes {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Název výstupu."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Nastavit proměnou {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Proměnná, která se má nastavit. Pokud neexistuje, bude přidána."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Je-li <em>{0}</em> vyslán"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Akce nebyla specifikována"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Zadejte jedno nebo více jmen akcí oddělených čárkou."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Iterovat dokud <em>{0}</em> je pravda"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Iterovat, dokud je podmínka pravdivá."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/cs/TheAdmin.po b/Localization/cs/TheAdmin.po
index 5fd22509b40cc..22cd79d9952ba 100644
--- a/Localization/cs/TheAdmin.po
+++ b/Localization/cs/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Světlý režim"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Tmavý režim"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Navštívit stránku"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Sbalit / rozbalit menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Odstranit"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Opravdu chcete odstranit tento prvek?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Zrušit"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/cs/TheAgencyTheme.po b/Localization/cs/TheAgencyTheme.po
index 1296a7e3e23ab..2a825562599f5 100644
--- a/Localization/cs/TheAgencyTheme.po
+++ b/Localization/cs/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Požadovaná stránka nebyla nalezena."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/cs/TheBlogTheme.po b/Localization/cs/TheBlogTheme.po
index 43ea942b0e006..0576c6666aa77 100644
--- a/Localization/cs/TheBlogTheme.po
+++ b/Localization/cs/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-02-18 20:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "{0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Nebyly nalezeny žádné výsledky."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Stránka nebyla nalezena"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/cs/TheTheme.po b/Localization/cs/TheTheme.po
index 0ff379558f3e1..dc677bdd335bb 100644
--- a/Localization/cs/TheTheme.po
+++ b/Localization/cs/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Vítejte v Orchard Core, vaše webová aplikace byla úspěšně vytvořena."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/da/OrchardCore.Admin.po b/Localization/da/OrchardCore.Admin.po
index c9228e282347b..d64584d5417df 100644
--- a/Localization/da/OrchardCore.Admin.po
+++ b/Localization/da/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Administration"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Administrator Indstillinger"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Eksporterer administrator indstillingerne."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Velkommen til Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Du er velkommen til at gennemse menuen og opdage alle mulighederne."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Aktiver mørk tilstand administrator theme"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Kan et mørkt administrator theme kan bruges."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Kan titlerne vises i øverste bjælke."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Administration"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/da/OrchardCore.AdminDashboard.po b/Localization/da/OrchardCore.AdminDashboard.po
index fbf931b77b801..c845e4ea35045 100644
--- a/Localization/da/OrchardCore.AdminDashboard.po
+++ b/Localization/da/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Nej"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Position"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Bredde"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/da/OrchardCore.AdminMenu.po b/Localization/da/OrchardCore.AdminMenu.po
index 5b6deb97fefb7..71c2ea88fdd16 100644
--- a/Localization/da/OrchardCore.AdminMenu.po
+++ b/Localization/da/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Alias.po b/Localization/da/OrchardCore.Alias.po
index 5a7a614cb51cb..e239e761e3013 100644
--- a/Localization/da/OrchardCore.Alias.po
+++ b/Localization/da/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/da/OrchardCore.ArchiveLater.po b/Localization/da/OrchardCore.ArchiveLater.po
index 15be3a23a7a56..228e51f4f87ac 100644
--- a/Localization/da/OrchardCore.ArchiveLater.po
+++ b/Localization/da/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/da/OrchardCore.AuditTrail.po b/Localization/da/OrchardCore.AuditTrail.po
index 4fd86a40ca4b5..8744c0c2d25d1 100644
--- a/Localization/da/OrchardCore.AuditTrail.po
+++ b/Localization/da/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/da/OrchardCore.Autoroute.po b/Localization/da/OrchardCore.Autoroute.po
index 004e976dc1ba9..93b992b5a016d 100644
--- a/Localization/da/OrchardCore.Autoroute.po
+++ b/Localization/da/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/da/OrchardCore.BackgroundTasks.po b/Localization/da/OrchardCore.BackgroundTasks.po
index 8ef23f06c415e..5f787ef713c06 100644
--- a/Localization/da/OrchardCore.BackgroundTasks.po
+++ b/Localization/da/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-22 07:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/da/OrchardCore.ContentFields.po b/Localization/da/OrchardCore.ContentFields.po
index b0fe3c89b6523..18a3832fd1bc8 100644
--- a/Localization/da/OrchardCore.ContentFields.po
+++ b/Localization/da/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/da/OrchardCore.ContentLocalization.po b/Localization/da/OrchardCore.ContentLocalization.po
index c0f832928d9ac..e51d6dd8581d7 100644
--- a/Localization/da/OrchardCore.ContentLocalization.po
+++ b/Localization/da/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/da/OrchardCore.ContentPreview.po b/Localization/da/OrchardCore.ContentPreview.po
index 08279d46cdfc6..2c540529128c7 100644
--- a/Localization/da/OrchardCore.ContentPreview.po
+++ b/Localization/da/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/da/OrchardCore.ContentTypes.po b/Localization/da/OrchardCore.ContentTypes.po
index fcee4e8e9dd04..0fc22997950d4 100644
--- a/Localization/da/OrchardCore.ContentTypes.po
+++ b/Localization/da/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/da/OrchardCore.Contents.po b/Localization/da/OrchardCore.Contents.po
index 07d65ee8fabeb..6876f444d7bea 100644
--- a/Localization/da/OrchardCore.Contents.po
+++ b/Localization/da/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/da/OrchardCore.CustomSettings.po b/Localization/da/OrchardCore.CustomSettings.po
index fa5c25c2ab671..f11e1d040130c 100644
--- a/Localization/da/OrchardCore.CustomSettings.po
+++ b/Localization/da/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/da/OrchardCore.Data.YesSql.po b/Localization/da/OrchardCore.Data.YesSql.po
index e73641504e29d..6b74579983d80 100644
--- a/Localization/da/OrchardCore.Data.YesSql.po
+++ b/Localization/da/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Demo.po b/Localization/da/OrchardCore.Demo.po
index 2c3413be0104b..47282a255594d 100644
--- a/Localization/da/OrchardCore.Demo.po
+++ b/Localization/da/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/da/OrchardCore.Deployment.Remote.po b/Localization/da/OrchardCore.Deployment.Remote.po
index 08e0049f9d57c..a1a91c4c29536 100644
--- a/Localization/da/OrchardCore.Deployment.Remote.po
+++ b/Localization/da/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/da/OrchardCore.Deployment.po b/Localization/da/OrchardCore.Deployment.po
index 6a7bf5985a45d..afdc833c2d82c 100644
--- a/Localization/da/OrchardCore.Deployment.po
+++ b/Localization/da/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/da/OrchardCore.Diagnostics.po b/Localization/da/OrchardCore.Diagnostics.po
index 85cc4f23e8363..bf25c726f5ac2 100644
--- a/Localization/da/OrchardCore.Diagnostics.po
+++ b/Localization/da/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2021-07-15 18:34\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/da/OrchardCore.Email.Abstractions.po b/Localization/da/OrchardCore.Email.Abstractions.po
index d740f9055de9e..0a5baefc86f5b 100644
--- a/Localization/da/OrchardCore.Email.Abstractions.po
+++ b/Localization/da/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Email.po b/Localization/da/OrchardCore.Email.po
index ff99a699b7f83..1d31b78b05b20 100644
--- a/Localization/da/OrchardCore.Email.po
+++ b/Localization/da/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/da/OrchardCore.Facebook.po b/Localization/da/OrchardCore.Facebook.po
index cc3e392508436..be7eb01056cd0 100644
--- a/Localization/da/OrchardCore.Facebook.po
+++ b/Localization/da/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/da/OrchardCore.Features.po b/Localization/da/OrchardCore.Features.po
index 87323f628ec9b..2dc834a88921b 100644
--- a/Localization/da/OrchardCore.Features.po
+++ b/Localization/da/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Flows.po b/Localization/da/OrchardCore.Flows.po
index a92ae8ae9792f..5fa62f0682029 100644
--- a/Localization/da/OrchardCore.Flows.po
+++ b/Localization/da/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/da/OrchardCore.Forms.po b/Localization/da/OrchardCore.Forms.po
index 0a9c999d56881..d8bb67ef4045c 100644
--- a/Localization/da/OrchardCore.Forms.po
+++ b/Localization/da/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/da/OrchardCore.GitHub.po b/Localization/da/OrchardCore.GitHub.po
index 953549ee0657d..2f30eebf5c867 100644
--- a/Localization/da/OrchardCore.GitHub.po
+++ b/Localization/da/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/da/OrchardCore.Google.po b/Localization/da/OrchardCore.Google.po
index 86d17de3b90ad..6bc71fe6171a8 100644
--- a/Localization/da/OrchardCore.Google.po
+++ b/Localization/da/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/da/OrchardCore.Html.po b/Localization/da/OrchardCore.Html.po
index 30bd5aada8a3c..1ba80cd8fc58c 100644
--- a/Localization/da/OrchardCore.Html.po
+++ b/Localization/da/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/da/OrchardCore.Https.po b/Localization/da/OrchardCore.Https.po
index 39372e4edc8b2..33322aacaca4c 100644
--- a/Localization/da/OrchardCore.Https.po
+++ b/Localization/da/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/da/OrchardCore.Infrastructure.Abstractions.po b/Localization/da/OrchardCore.Infrastructure.Abstractions.po
index 84331ece6fa3c..daa61cd89ffd1 100644
--- a/Localization/da/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/da/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/da/OrchardCore.Layers.po b/Localization/da/OrchardCore.Layers.po
index 9c9ae9a1f1649..8101eacda1a53 100644
--- a/Localization/da/OrchardCore.Layers.po
+++ b/Localization/da/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/da/OrchardCore.Liquid.po b/Localization/da/OrchardCore.Liquid.po
index f561e835435ad..d0e94259e08d0 100644
--- a/Localization/da/OrchardCore.Liquid.po
+++ b/Localization/da/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/da/OrchardCore.Lists.po b/Localization/da/OrchardCore.Lists.po
index acb79cff4b1c3..a474cc67f8166 100644
--- a/Localization/da/OrchardCore.Lists.po
+++ b/Localization/da/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/da/OrchardCore.Localization.po b/Localization/da/OrchardCore.Localization.po
index a1f9fb9e0b612..300b5a244501b 100644
--- a/Localization/da/OrchardCore.Localization.po
+++ b/Localization/da/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/da/OrchardCore.Markdown.po b/Localization/da/OrchardCore.Markdown.po
index 9a9f4f9bb8004..60ec1fdab9a17 100644
--- a/Localization/da/OrchardCore.Markdown.po
+++ b/Localization/da/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/da/OrchardCore.Media.po b/Localization/da/OrchardCore.Media.po
index 42d11fc482e62..344a77c17d031 100644
--- a/Localization/da/OrchardCore.Media.po
+++ b/Localization/da/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/da/OrchardCore.Menu.po b/Localization/da/OrchardCore.Menu.po
index 0dd6e2dd1dd46..ebb3579507ff8 100644
--- a/Localization/da/OrchardCore.Menu.po
+++ b/Localization/da/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/da/OrchardCore.Microsoft.Authentication.po b/Localization/da/OrchardCore.Microsoft.Authentication.po
index b7fe55d0ad720..cdcd756b2b9cd 100644
--- a/Localization/da/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/da/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/da/OrchardCore.Navigation.po b/Localization/da/OrchardCore.Navigation.po
index 9c1f679928844..ecf0800f169ce 100644
--- a/Localization/da/OrchardCore.Navigation.po
+++ b/Localization/da/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Notifications.po b/Localization/da/OrchardCore.Notifications.po
index 83ce03c76faba..45047c209de90 100644
--- a/Localization/da/OrchardCore.Notifications.po
+++ b/Localization/da/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/da/OrchardCore.OpenId.po b/Localization/da/OrchardCore.OpenId.po
index b25c035cb5fba..f3914091545cf 100644
--- a/Localization/da/OrchardCore.OpenId.po
+++ b/Localization/da/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/da/OrchardCore.Placements.po b/Localization/da/OrchardCore.Placements.po
index 63e2ae50fe605..86522f7d51c96 100644
--- a/Localization/da/OrchardCore.Placements.po
+++ b/Localization/da/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/da/OrchardCore.ProjectTemplates.po b/Localization/da/OrchardCore.ProjectTemplates.po
index fedeef07cfdb6..b20f91c3457e9 100644
--- a/Localization/da/OrchardCore.ProjectTemplates.po
+++ b/Localization/da/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-05-05 19:06\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/da/OrchardCore.PublishLater.po b/Localization/da/OrchardCore.PublishLater.po
index 45d9c8678b7fd..156b1f8888b56 100644
--- a/Localization/da/OrchardCore.PublishLater.po
+++ b/Localization/da/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/da/OrchardCore.Queries.po b/Localization/da/OrchardCore.Queries.po
index ef36630dfa504..cdda3c7f391a0 100644
--- a/Localization/da/OrchardCore.Queries.po
+++ b/Localization/da/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/da/OrchardCore.ReCaptcha.Core.po b/Localization/da/OrchardCore.ReCaptcha.Core.po
index 46bb35954354b..9bc325ce38090 100644
--- a/Localization/da/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/da/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/da/OrchardCore.ReCaptcha.po b/Localization/da/OrchardCore.ReCaptcha.po
index 1c0cfb3fc4de6..31c5518f5bc50 100644
--- a/Localization/da/OrchardCore.ReCaptcha.po
+++ b/Localization/da/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/da/OrchardCore.Recipes.Core.po b/Localization/da/OrchardCore.Recipes.Core.po
index 542754c727d74..76da30d561bd4 100644
--- a/Localization/da/OrchardCore.Recipes.Core.po
+++ b/Localization/da/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/da/OrchardCore.Roles.po b/Localization/da/OrchardCore.Roles.po
index 88140f6de094f..7d763dd402cbb 100644
--- a/Localization/da/OrchardCore.Roles.po
+++ b/Localization/da/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/da/OrchardCore.Rules.po b/Localization/da/OrchardCore.Rules.po
index 859002fde2f23..886ddec47c65e 100644
--- a/Localization/da/OrchardCore.Rules.po
+++ b/Localization/da/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/da/OrchardCore.Search.Elasticsearch.po b/Localization/da/OrchardCore.Search.Elasticsearch.po
index 030fc6d58797b..50897e5e3e704 100644
--- a/Localization/da/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/da/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/da/OrchardCore.Search.Lucene.po b/Localization/da/OrchardCore.Search.Lucene.po
index 1701a7abcc077..c46dcfc7a820c 100644
--- a/Localization/da/OrchardCore.Search.Lucene.po
+++ b/Localization/da/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Search.po b/Localization/da/OrchardCore.Search.po
index f75f389c04ac7..f0884b22a2410 100644
--- a/Localization/da/OrchardCore.Search.po
+++ b/Localization/da/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/da/OrchardCore.Security.po b/Localization/da/OrchardCore.Security.po
index 1ee2f0d80a16d..d2091d8982bd7 100644
--- a/Localization/da/OrchardCore.Security.po
+++ b/Localization/da/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/da/OrchardCore.Seo.po b/Localization/da/OrchardCore.Seo.po
index a347f9dd7211f..015c923c89a09 100644
--- a/Localization/da/OrchardCore.Seo.po
+++ b/Localization/da/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/da/OrchardCore.Settings.po b/Localization/da/OrchardCore.Settings.po
index 520660a824ce5..d324b2c903d24 100644
--- a/Localization/da/OrchardCore.Settings.po
+++ b/Localization/da/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/da/OrchardCore.Setup.Core.po b/Localization/da/OrchardCore.Setup.Core.po
index ad7c8332f45d9..7410219d65c42 100644
--- a/Localization/da/OrchardCore.Setup.Core.po
+++ b/Localization/da/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/da/OrchardCore.Setup.po b/Localization/da/OrchardCore.Setup.po
index ae08ad702a61d..734481087605a 100644
--- a/Localization/da/OrchardCore.Setup.po
+++ b/Localization/da/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/da/OrchardCore.Shortcodes.po b/Localization/da/OrchardCore.Shortcodes.po
index c46d2045a7913..4e4776c59b18c 100644
--- a/Localization/da/OrchardCore.Shortcodes.po
+++ b/Localization/da/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/da/OrchardCore.Sitemaps.po b/Localization/da/OrchardCore.Sitemaps.po
index 0d74422beb24e..aed858ff3f4e0 100644
--- a/Localization/da/OrchardCore.Sitemaps.po
+++ b/Localization/da/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/da/OrchardCore.Sms.po b/Localization/da/OrchardCore.Sms.po
index 8e3691051b39e..c6472b775aec6 100644
--- a/Localization/da/OrchardCore.Sms.po
+++ b/Localization/da/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/da/OrchardCore.Spatial.po b/Localization/da/OrchardCore.Spatial.po
index fdab502655234..a7693d1259254 100644
--- a/Localization/da/OrchardCore.Spatial.po
+++ b/Localization/da/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/da/OrchardCore.Taxonomies.po b/Localization/da/OrchardCore.Taxonomies.po
index dc218637ee1c8..d379f13f6ec78 100644
--- a/Localization/da/OrchardCore.Taxonomies.po
+++ b/Localization/da/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Templates.Cms.Module.po b/Localization/da/OrchardCore.Templates.Cms.Module.po
index 78c20dbd8b320..2b9434607bc6e 100644
--- a/Localization/da/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/da/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2022-05-05 19:17\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/da/OrchardCore.Templates.po b/Localization/da/OrchardCore.Templates.po
index 3650d0534a0fb..00a0a567b6907 100644
--- a/Localization/da/OrchardCore.Templates.po
+++ b/Localization/da/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/da/OrchardCore.Tenants.po b/Localization/da/OrchardCore.Tenants.po
index 83faf7789089d..d224cfdf82ac3 100644
--- a/Localization/da/OrchardCore.Tenants.po
+++ b/Localization/da/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/da/OrchardCore.Tests.po b/Localization/da/OrchardCore.Tests.po
index 22f99dab9d182..4dc6f489ccf0f 100644
--- a/Localization/da/OrchardCore.Tests.po
+++ b/Localization/da/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/da/OrchardCore.Themes.po b/Localization/da/OrchardCore.Themes.po
index 11559b74d829b..f164b23d33d21 100644
--- a/Localization/da/OrchardCore.Themes.po
+++ b/Localization/da/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/da/OrchardCore.Title.po b/Localization/da/OrchardCore.Title.po
index 68509aa815433..6d144387fd5c9 100644
--- a/Localization/da/OrchardCore.Title.po
+++ b/Localization/da/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/da/OrchardCore.Twitter.po b/Localization/da/OrchardCore.Twitter.po
index 168af3307c2a4..2fcfea72530a7 100644
--- a/Localization/da/OrchardCore.Twitter.po
+++ b/Localization/da/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/da/OrchardCore.Users.Core.po b/Localization/da/OrchardCore.Users.Core.po
index a1b48a45933ef..23e43a2aaae35 100644
--- a/Localization/da/OrchardCore.Users.Core.po
+++ b/Localization/da/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/da/OrchardCore.Users.po b/Localization/da/OrchardCore.Users.po
index 009faa1396c74..e2dc0cdd00808 100644
--- a/Localization/da/OrchardCore.Users.po
+++ b/Localization/da/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/da/OrchardCore.Widgets.po b/Localization/da/OrchardCore.Widgets.po
index 98504910039fc..dc1feeebed694 100644
--- a/Localization/da/OrchardCore.Widgets.po
+++ b/Localization/da/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/da/OrchardCore.Workflows.po b/Localization/da/OrchardCore.Workflows.po
index 66e95dff5e99f..2d28de1e527d7 100644
--- a/Localization/da/OrchardCore.Workflows.po
+++ b/Localization/da/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/da/TheAdmin.po b/Localization/da/TheAdmin.po
index 4684fb3ea50da..84f1d0422c603 100644
--- a/Localization/da/TheAdmin.po
+++ b/Localization/da/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/da/TheAgencyTheme.po b/Localization/da/TheAgencyTheme.po
index 2c0a57e56f1bd..ec52c0ce4b80d 100644
--- a/Localization/da/TheAgencyTheme.po
+++ b/Localization/da/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/da/TheBlogTheme.po b/Localization/da/TheBlogTheme.po
index 82943b321eda1..8d992da0e5a17 100644
--- a/Localization/da/TheBlogTheme.po
+++ b/Localization/da/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/da/TheTheme.po b/Localization/da/TheTheme.po
index 0fb0bdddb8521..45a3e4f3d8179 100644
--- a/Localization/da/TheTheme.po
+++ b/Localization/da/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/de/OrchardCore.Admin.po b/Localization/de/OrchardCore.Admin.po
index d705de034e795..519a827ae43d0 100644
--- a/Localization/de/OrchardCore.Admin.po
+++ b/Localization/de/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Admin"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Admin-Einstellungen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exportiert die Admin-Einstellungen."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Willkommen zu Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Fühlen Sie sich frei, das Menü zu durchstöbern und all seine Möglichkeiten zu entdecken."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Aktiviere den dunklen Modus für das Admin-Theme"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Ob ein Admin-Theme im dunklen Modus angezeigt werden kann."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Gibt an, ob die Titel in der oberen Leiste angezeigt werden."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
+msgstr "Admin"
+
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
 msgstr ""
 
diff --git a/Localization/de/OrchardCore.AdminDashboard.po b/Localization/de/OrchardCore.AdminDashboard.po
index 36d3d085870af..bcc2e60d6104d 100644
--- a/Localization/de/OrchardCore.AdminDashboard.po
+++ b/Localization/de/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Nein"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Breite"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/de/OrchardCore.AdminMenu.po b/Localization/de/OrchardCore.AdminMenu.po
index dda5eda78470e..c696ca4d3545f 100644
--- a/Localization/de/OrchardCore.AdminMenu.po
+++ b/Localization/de/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Admin-Menü {0} erstellen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Knoten erstellen"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Admin-Menü bearbeiten: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Knoten bearbeiten"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Die Priorität dieses Links, der als aktiv angezeigt wird, anstatt ein anderer, wenn beide auf die gleiche Url verweisen. Der Link mit dem höchsten Wert hat den aktiven Status in der Navigation."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Die Position dieses Links im Admin-Menü."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -258,13 +258,13 @@ msgstr "Abbrechen"
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:12
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
-msgstr ""
+msgstr "Link"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
-msgstr ""
+msgstr "Link Text"
 
 #. <span class="hint">@T["The Link Text as it will be shown in the tree."]</span>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:18
@@ -272,11 +272,11 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Der Link Text, wie er im Baum angezeigt wird."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
-msgstr ""
+msgstr "Link Url"
 
 #. <span class="hint">@T["The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"]</span>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:24
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Die Url des Links. Ein Link wird nur angezeigt, wenn er oder eines seiner Unterelemente eine Url hat. Die Url wird relativ zum Root der Admin-Seite sein"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Wählen Sie ein Symbol"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -348,7 +348,7 @@ msgstr "Die Berechtigungen, die erforderlich sind, um diesen Menüeintrag anzuze
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeSummary.cshtml:4
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeSummary"
 msgid "Link"
-msgstr ""
+msgstr "Link"
 
 #. <h4 class="card-title">@T["Link Admin Node"]</h4>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeThumbnail.cshtml:3
@@ -572,11 +572,11 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Platzhalter"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
-msgstr ""
+msgstr "Link Text"
 
 #. <span class="hint">@T["The text of the menu item as it will be shown in the tree."]</span>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:18
@@ -584,7 +584,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Der Text des Menüpunktes, wie er im Baum angezeigt wird."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -597,49 +597,49 @@ msgid "Pick"
 msgstr "Auswählen"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Wählen Sie ein Symbol, das angezeigt werden soll, wenn dieses Menü auf der ersten Ebene ist."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Wählen Sie ein Symbol"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Zugriffsrechte"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Tippen, um zu suchen"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Auswählen"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Entfernen"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Kein Ergebnis gefunden"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Die Berechtigungen, die erforderlich sind, um diesen Menüeintrag anzuzeigen (optional)."
diff --git a/Localization/de/OrchardCore.Alias.po b/Localization/de/OrchardCore.Alias.po
index dfefe86e426a4..46411abf3bdf6 100644
--- a/Localization/de/OrchardCore.Alias.po
+++ b/Localization/de/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Muster enthält keinen gültigen Liquid-Ausdruck. Details: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Leer lassen, um neu zu generieren."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias ist generiert und Eingabe ist deaktiviert"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/de/OrchardCore.ArchiveLater.po b/Localization/de/OrchardCore.ArchiveLater.po
index 34e358a6c09e7..b5b44369a61cf 100644
--- a/Localization/de/OrchardCore.ArchiveLater.po
+++ b/Localization/de/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/de/OrchardCore.AuditTrail.po b/Localization/de/OrchardCore.AuditTrail.po
index 36b2e4815574b..182aa1659ed7e 100644
--- a/Localization/de/OrchardCore.AuditTrail.po
+++ b/Localization/de/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/de/OrchardCore.Autoroute.po b/Localization/de/OrchardCore.Autoroute.po
index 5fd8440f5a391..3d460eeb09f34 100644
--- a/Localization/de/OrchardCore.Autoroute.po
+++ b/Localization/de/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Aktivieren, um Autoroute für dieses Inhaltselement zu deaktivieren."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Aktivieren um anzugeben, dass ein untergeordneter Inhalt zu einem absoluten Pfad geleitet wird."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/de/OrchardCore.BackgroundTasks.po b/Localization/de/OrchardCore.BackgroundTasks.po
index b06755bee2659..ec102ac8c2052 100644
--- a/Localization/de/OrchardCore.BackgroundTasks.po
+++ b/Localization/de/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-22 07:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/de/OrchardCore.ContentFields.po b/Localization/de/OrchardCore.ContentFields.po
index 4555f099dd2bc..15e5a3d23aee2 100644
--- a/Localization/de/OrchardCore.ContentFields.po
+++ b/Localization/de/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Schalter"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweis, der für dieses Feld im Editor angezeigt wird."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Keine Inhaltselemente."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nicht veröffentlicht"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Eingeben, um zu suchen"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Auswählen"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Löschen"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Keine Ergebnisse"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Ob mehrere Elemente ausgewählt werden dürfen."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Alle Inhaltstypen anzeigen"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Die anzuzeigenden Inhaltstypen. Wählen Sie mindestens einen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweis, der für dieses Feld im Editor angezeigt wird."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Lokalisiert"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Ob ein Wert erforderlich ist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweis, der für dieses Feld im Editor angezeigt wird."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Ob ein Wert erforderlich ist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg Editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentation für Editoroptionen"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Linktext"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Ob die URL erforderlich ist."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "URL des Links verwenden"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Der Hinweis, der für die URL im Editor angezeigt wird."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Der Hinweis, der für den Linktext im Editor angezeigt wird."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Ein Hinweis (Platzhalter) zum Anzeigen, wenn die Eingabe der Url leer ist."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Ein Hinweis (Platzhalter) zum Anzeigen, wenn der Text leer ist."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Eine gültige Url, die beim Erstellen eines Inhalts vorgeschlagen wird."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Keine Inhaltselemente."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nicht veröffentlicht"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Tippen, um zu suchen"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Auswählen"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Entfernen"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Kein Ergebnis gefunden"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Um die Auswahl mehrere Elemente zuzulassen."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Die anzuzeigenden Inhaltstypen. Wählen Sie mindestens einen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Bereich"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Keine"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Ob ein Wert erforderlich ist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweis, der für dieses Feld im Editor angezeigt wird."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Ein Hinweis zum Anzeigen, wenn die Eingabe leer ist. (optional)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Die Anzahl der Ziffern nach dem Dezimalpunkt."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Der minimal erlaubte Wert. (optional)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Der maximal erlaubte Wert. (optional)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Daten bearbeiten"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Eine JSON-Darstellung der erlaubten Werte, z.B. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Ob ein Wert erforderlich ist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweis, der für dieses Feld im Editor angezeigt wird."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Ob ein Wert erforderlich ist."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Erforderlich"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Ob ein Wert erforderlich ist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Hinweis"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweis, der für dieses Feld im Editor angezeigt wird."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Breite"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Die Breite der Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Höhe"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Die Höhe der Videobox"
diff --git a/Localization/de/OrchardCore.ContentLocalization.po b/Localization/de/OrchardCore.ContentLocalization.po
index bab7a0e4ddddf..ce69c8e74f9e2 100644
--- a/Localization/de/OrchardCore.ContentLocalization.po
+++ b/Localization/de/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/de/OrchardCore.ContentPreview.po b/Localization/de/OrchardCore.ContentPreview.po
index 27b1dfc28c90a..0a18e95778409 100644
--- a/Localization/de/OrchardCore.ContentPreview.po
+++ b/Localization/de/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Die Eingabe enthält keinen gültigen Liquid-Ausdruck. Details: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Vorschau"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Vorschau getrennt"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Vorschau-Fehler"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/de/OrchardCore.ContentTypes.po b/Localization/de/OrchardCore.ContentTypes.po
index 7d4a644af887c..2716d74c94f02 100644
--- a/Localization/de/OrchardCore.ContentTypes.po
+++ b/Localization/de/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Inhaltsteile"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Der Anzeigename darf nicht leer sein."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Ein Typ mit dem gleichen Anzeigenamen existiert bereits."
@@ -66,10 +66,10 @@ msgstr "Ein Typ mit dem gleichen Anzeigenamen existiert bereits."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Der technische Name darf nicht leer sein."
@@ -78,10 +78,10 @@ msgstr "Der technische Name darf nicht leer sein."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Der technische Bezeichner muss mit einem Buchstaben beginnen."
@@ -90,10 +90,10 @@ msgstr "Der technische Bezeichner muss mit einem Buchstaben beginnen."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Der technische Name enthält ungültige Zeichen."
@@ -101,133 +101,133 @@ msgstr "Der technische Name enthält ungültige Zeichen."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Ein Typ mit dem gleichen Namen existiert bereits."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Der \"{0}\" Inhaltstyp wurde erstellt."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\" Einstellungen wurden gespeichert."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0} wurde entfernt."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Der Teil \"{0}\" wurde hinzugefügt."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Ein Typ mit dem gleichen Anzeigenamen existiert bereits."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Ein Typ mit dem gleichen technischen Namen existiert bereits."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Der Teil \"{0}\" wurde entfernt."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Der Inhaltsteil konnte nicht erstellt werden."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Der Inhaltsteil \"{0}\" wurde erstellt."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Die Einstellungen von \"{0}\" wurden gespeichert."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Ein Feld mit dem gleichen Anzeigenamen existiert bereits."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Ein Typ mit dem gleichen Namen existiert bereits."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Das Feld \"{0}\" wurde hinzugefügt."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Anzeigename geändert zu {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Die \"{0}\" Feldeinstellungen wurden gespeichert."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Das Feld \"{0}\" wurde entfernt."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Die \"{0}\" Teileinstellungen wurden gespeichert."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Der Name des Inhaltstyps darf nicht leer sein."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Teil '{0}' kann nicht hinzugefügt werden. Es existiert bereits."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Neues Feld zu \"{0}\" hinzufügen"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Name des Feldes, wie er auf dem Bildschirm angezeigt wird."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Benannten Teil zu \"{0}\" hinzufügen"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Name des wiederverwendbaren Teils, wie er auf Bildschirmen angezeigt wird."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Technischer Name des wiederverwendbaren Teils."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Name des Teils, wie er auf dem Bildschirm dargestellt wird. Leer lassen, um Standardwerte zu verwenden."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Auswählen, um das mehrfache Anhängen zu erlauben."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Name des Typs, wie er auf Bildschirmen angezeigt wird."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Neuer Inhaltstyp"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Name des Typs, wie er auf Bildschirmen angezeigt wird."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Neuer Inhaltsteil"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Erstellen"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Inhaltstyp bearbeiten - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Felder"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Löschen"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Feld Hinzufügen"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Teile"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Enthält die Felder für den aktuellen Typ"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Teile hinzufügen"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Benannten Teil hinzufügen"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Speichern"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Löschen"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" Einstellungen für \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Name des Feldes, wie er auf dem Bildschirm angezeigt wird."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Technischer Name des Feldes."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Welche Art von Editor sollte verwendet werden?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Welche Art des Anzeigemodus sollte verwendet werden?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Speichern"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Einige Part-Einstellungen für alle Typen können auch auf der Ebene <a href=\"{0}\">Part-Definitionen</a> definiert werden."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Name des Parts, wie er auf dem Bildschirm angezeigt wird."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Die Beschreibung des Parts, wie es auf den Bildschirmen dargestellt wird."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Welche Art von Editor soll verwendet werden?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Welche Art von Anzeigemodus soll verwendet werden?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Speichern"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Abbrechen"
diff --git a/Localization/de/OrchardCore.Contents.po b/Localization/de/OrchardCore.Contents.po
index 0af08216a1344..943b75b0743cb 100644
--- a/Localization/de/OrchardCore.Contents.po
+++ b/Localization/de/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Veröffentlichung von {0} wurde aufgehoben."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Alle Inhaltstypen"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Ein oder mehrere Validierungsfehler sind aufgetreten."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Exportiert die Inhalts-Prüfprotokoll Einstellungen."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Inhalt"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Erledigt"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Prüfprotokoll"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Gibt an, ob der Prüfprotokoll-Kommentar während der Bearbeitung angezeigt wird."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Das Datum, an dem der Inhalt erstellt oder zuerst veröffentlicht wurde."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Abbruch"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "und fortsetzen"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Aktionen"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Inhalt"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Inhaltsentwurf wurde gespeichert."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Inhaltselement"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Alle Inhaltstypen anzeigen"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Wählen Sie ein Symbol"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Alle Inhaltstypen anzeigen"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Die Anzahl der Inhaltselemente dieser Quelle limitieren. Hinweis: Nur ein Inhaltstyp ist selektierbar, wenn diese Option ausgewählt ist."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Die übliche Häufigkeit, mit welcher diese Inhaltstypen voraussichtlich geändert werden."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Alle Inhaltstypen"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Inhalt erstellen"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Auswählen, um das Inhaltselement beim Erstellen zu veröffentlichen. Ansonsten wird es als Entwurf gespeichert."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Inhalte mit Ausdruck löschen: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Entwurf als JSON ansehen"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Entwurf als JSON herunterladen"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Veröffentlicht als JSON ansehen"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Veröffentlicht als JSON herunterladen"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Als JSON anzeigen"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Keine \"Inhalt zum Bereitstellungsziel exportieren\"-Pläne gefunden. Erstellen Sie einen Bereitstellungsplan und fügen Sie diesem einen \"Inhalt zum Bereitstellungsziel exportieren\"-Schritt hinzu."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Inhalt"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Neu"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Inhalt mit Ausdruck veröffentlichen: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Inhalte mit Ausdruck abrufen: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Veröffentlichung des Inhalts mit dem Ausdruck aufheben: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Aktualisieren des Inhalts mit dem Ausdruck: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Geben Sie einen JavaScript-Ausdruck ein, welcher die Inhaltselement-Id (ContentItemId) bestimmt. Zum Beispiel: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/de/OrchardCore.CustomSettings.po b/Localization/de/OrchardCore.CustomSettings.po
index 7a72f95fc0609..a83b85c49743d 100644
--- a/Localization/de/OrchardCore.CustomSettings.po
+++ b/Localization/de/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Benutzerdefinierte Einstellungen"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/de/OrchardCore.Data.YesSql.po b/Localization/de/OrchardCore.Data.YesSql.po
index 2f857be974d85..a37e10e5e10d3 100644
--- a/Localization/de/OrchardCore.Data.YesSql.po
+++ b/Localization/de/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/de/OrchardCore.Demo.po b/Localization/de/OrchardCore.Demo.po
index 8f0a79d63db19..6244cb1ebcac1 100644
--- a/Localization/de/OrchardCore.Demo.po
+++ b/Localization/de/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Vorname"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Nachname"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/de/OrchardCore.Deployment.Remote.po b/Localization/de/OrchardCore.Deployment.Remote.po
index 6a86a6ab2e948..5fd9ee1110e5f 100644
--- a/Localization/de/OrchardCore.Deployment.Remote.po
+++ b/Localization/de/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Sendet den Bereitstellungsplan an eine entfernte Instanz."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Client-Name"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Remote-Instanz erstellen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Client-Name"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Remote-Client bearbeiten"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Client-Name"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Remote-Instanz bearbeiten"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Client-Name"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/de/OrchardCore.Deployment.po b/Localization/de/OrchardCore.Deployment.po
index 7625b6dfc61fa..41623e4f8dcd3 100644
--- a/Localization/de/OrchardCore.Deployment.po
+++ b/Localization/de/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON-Import"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Löschen"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Der Name ist erforderlich."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Deployment-Plan erstellen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Die eigene Datei, die als Teil des Plans hinzugefügt werden soll."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Der Dateiname, wie er dem Archiv hinzugefügt wird."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Deployment-Pläne"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Deployment-Plan bearbeiten"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Die Rezeptdatei, die als Teil des Plans hinzugefügt werden soll."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Der Rezeptname."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Der Rezept Anzeigename."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Die Rezeptbeschreibung."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Der Rezeptautor."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Das Rezept Webseite."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Die Rezeptversion."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Die Rezeptkategorien (durch Komma getrennte Werte)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/de/OrchardCore.Diagnostics.po b/Localization/de/OrchardCore.Diagnostics.po
index e8779afa21bcf..8f248a89d73d6 100644
--- a/Localization/de/OrchardCore.Diagnostics.po
+++ b/Localization/de/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Ihr Browser hat eine Anfrage gesendet, die dieser Server nicht verstehen konnte."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Beim Bearbeiten der Anfrage ist ein Fehler aufgetreten."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Sie haben keinen Zugriff auf diese Ressource."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Die Seite konnte nicht gefunden werden."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Sie sind nicht berechtigt, diesen Inhalt zu sehen."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/de/OrchardCore.Email.Abstractions.po b/Localization/de/OrchardCore.Email.Abstractions.po
index 99174e0482485..ad02570654202 100644
--- a/Localization/de/OrchardCore.Email.Abstractions.po
+++ b/Localization/de/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Das Feld {0} ist ein Pflichtfeld."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Die '{0}' Übertragungsmethode wird nicht unterstützt."
diff --git a/Localization/de/OrchardCore.Email.po b/Localization/de/OrchardCore.Email.po
index 6cc5e7761882b..77962cac9de41 100644
--- a/Localization/de/OrchardCore.Email.po
+++ b/Localization/de/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "E-Mail-Aufgabe"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Nachrichten"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Fehlgeschlagen"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "E-Mail senden"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "Die E-Mail-Adresse des Autors, die bestimmt, von wem die eMail stammt. Leer lassen, um die konfigurierte E-Mail-Adresse zu verwenden. Mit Liquid Support."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Die E-Mail-Adresse des Absenders. Wird benötigt, wenn nicht die gleiche als die \"Von\"-E-Mail-Adresse. Mit Liquid Support."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Die \"Antwort an\"-E-Mail-Adresse. Benötigt für E-Mail-Antworten an eine andere Adresse als die \"Von\"-Adresse. Mit Liquid Support."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Die kommaseparierte Liste der Empfänger E-Mail-Adressen. Mit Liquid Support."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "Die kommaseparierte Liste von Kopie E-Mail-Adressen (CC). Mit Liquid Unterstützung."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "Die kommaseparierte Liste von blinden Kopie E-Mail-Adressen (BCC). Mit Liquid Unterstützung."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Wenn aktiviert, wird der Text der E-Mail als HTML gesendet."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "An"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Der Absender ist optional. Dies ist hilfreich, wenn der E-Mail-Autor vom E-Mail-Absender abweicht."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "BCC"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "CC"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Antwort an"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Betreff"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Der aktuelle Mandant wird neu geladen, wenn die Einstellungen gespeichert werden."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Die Standard-E-Mail-Adresse, die als Absender verwendet werden soll, es sei denn, der Absender wurde gesetzt."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Zustellungsoptionen"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Die SMTP-Server-Domain, z.B. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Der SMTP Server Port, normalerweise 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Der Proxy-Server ist optional."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "Der Proxy-Port ist optional."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Wenn diese Option ausgewählt ist, wird die Identität des Anwendungspools oder die des Host-Prozesses verwendet, um sich beim Mail-Server zu authentifizieren."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Der Benutzername für die Authentifizierung."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Bestimmte Abholordner-Zustellungsoptionen"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Z.B. <i>C:\\Pfad\\Toder\\Tsein\\Site\\PickedUpEmail</i>, um E-Mails in einem <i>PickedUpEmail</i> Verzeichnis auf dem C-Laufwerk zu platzieren."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/de/OrchardCore.Facebook.po b/Localization/de/OrchardCore.Facebook.po
index 684c04f1abf81..580f954f4a852 100644
--- a/Localization/de/OrchardCore.Facebook.po
+++ b/Localization/de/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Der FaceBook Body enthält keinen gültigen Liquid Ausdruck. Details: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Der Wert enthält keinen gültigen Liquid-Ausdruck. Details: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Login-Einstellungen"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Der Requestpfad innerhalb des Anwendungspfads, wohin der User-Agent weitergeleitet werden wird. Die Middleware wird die Anfrage verarbeiten, sobald sie ankommt."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Die Vorlage des Plugins, im Liquid-Format."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Auf jeder Seite initialisieren"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/de/OrchardCore.Features.po b/Localization/de/OrchardCore.Features.po
index a6c0e2c3e5421..3d6d15e26f793 100644
--- a/Localization/de/OrchardCore.Features.po
+++ b/Localization/de/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Bitte wählen Sie eine oder mehrere Funktionen aus."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Massenaktionen"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Deaktivieren"
@@ -136,8 +136,8 @@ msgstr "Deaktivieren"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Aktivieren"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Nicht kategorisiert"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Deaktivieren der {0} -Funktion deaktiviert auch die folgenden abhängigen Funktionen:{1} Fortfahren?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Feature deaktivieren"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Ja"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Nein"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Nichts hier!</strong> Die Suche hat keine Ergebnisse geliefert."
diff --git a/Localization/de/OrchardCore.Flows.po b/Localization/de/OrchardCore.Flows.po
index e9e9e16c3e371..ad05af4c04857 100644
--- a/Localization/de/OrchardCore.Flows.po
+++ b/Localization/de/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Element hinzufügen"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Die Inhaltstypen, die dieser Bag enthalten kann, z.B. ein Slide für eine Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Widget einfügen"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Löschen"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Soll dieses Element wirklich entfernt werden?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/de/OrchardCore.Forms.po b/Localization/de/OrchardCore.Forms.po
index daef49be0979a..a5e0dbb7a2ec4 100644
--- a/Localization/de/OrchardCore.Forms.po
+++ b/Localization/de/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Modell-Validierungs-Fehler-Aufgabe hinzufügen"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validierung"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "ModelState-Aufgabe binden"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validierung"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Antiforgery-Token-Task validieren"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validierung"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Gültig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Ungültig"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Formularfeld-Aufgabe validieren"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validierung"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Gültig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Ungültig"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Formularfeld-Aufgabe validieren"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validierung"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Gültig"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Ungültig"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Der Name des Formularfeldes, das einen ungültigen Wert hat."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Bindet übermittelte Formularfelder an den ModelState."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Text, der auf der Schaltfläche angezeigt wird."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Der Typ der Schaltfläche."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "Die ID, die auf diesem Formularelement dargestellt werden soll."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Der zu rendernde Name dieses Formularelements."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "Die URL, an die das Formular gesendet werden soll."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Die HTTP-Methode, die beim Absenden des Formulars verwendet wird."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Aktivieren, um einen Anti Forgery Token im Formular zu generieren."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Der Typ der Schaltfläche."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Der Text, der angezeigt wird, wenn das Feld keinen Wert hat."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Standardwert für dieses Feld."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Der Text, der angezeigt wird, wenn das Feld keinen Wert hat."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "<em>{0}</em> validieren"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Der Name des zu validierenden Formularfeldes."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Prüft, ob das übermittelte Formular irgendwelche Validierungsfehler enthält."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/de/OrchardCore.GitHub.po b/Localization/de/OrchardCore.GitHub.po
index dd45e07d1e980..c24fabc8907b6 100644
--- a/Localization/de/OrchardCore.GitHub.po
+++ b/Localization/de/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "GitHub Authentifizierungseinstellungen"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Die im allgemeinen Tab Ihrer <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a> definierte Client-ID."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Das Geheimnis für Ihre App."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/de/OrchardCore.Google.po b/Localization/de/OrchardCore.Google.po
index 917b7b6ff9dca..18419f1005389 100644
--- a/Localization/de/OrchardCore.Google.po
+++ b/Localization/de/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Google Analytics Einstellungen"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Google Authentifizierungseinstellungen"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Die Client-ID, die in der Google API-Konsole für die Anwendung definiert ist."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Die Client-ID, die in der Google API-Konsole für die Anwendung definiert ist."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/de/OrchardCore.Html.po b/Localization/de/OrchardCore.Html.po
index d8dfee1252e39..95265bca8ff1a 100644
--- a/Localization/de/OrchardCore.Html.po
+++ b/Localization/de/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg Editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Der Body des Inhaltselements."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Optionen des Editors eingeben"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentation für Editoroptionen"
diff --git a/Localization/de/OrchardCore.Https.po b/Localization/de/OrchardCore.Https.po
index 642a9689f71cc..a7a6ac0da1312 100644
--- a/Localization/de/OrchardCore.Https.po
+++ b/Localization/de/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Legt fest, ob eine permanente Umleitung, 308 Moved Permanently, statt einer temporären Umleitung, 307 Gefunden beim Umleiten zu HTTPS verwendet werden soll"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/de/OrchardCore.Infrastructure.Abstractions.po b/Localization/de/OrchardCore.Infrastructure.Abstractions.po
index 827fcca9a87fe..e5f4480f9d344 100644
--- a/Localization/de/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/de/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/de/OrchardCore.Layers.po b/Localization/de/OrchardCore.Layers.po
index 590a9d95654ec..e06f92f77afb9 100644
--- a/Localization/de/OrchardCore.Layers.po
+++ b/Localization/de/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Ebene erstellen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Beschreibung"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Ebene bearbeiten - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Widgets und Ebenen bearbeiten"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget erfolgreich verschoben. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zonen"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Bitte <a href=\"{0}\">definieren Sie die verfügbaren Zonen</a> bevor Sie Widgets hinzufügen"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Widget hinzufügen"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Ebenen"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Wählen Sie eine Ebene, um ihre zugehörigen Widgets anzuzeigen."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Löschen"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Bitte <a href=\"{0}\">erstellen Sie eine Ebene</a>, bevor Widgets hinzugefügt werden"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Wenn aktiviert, wird der Titel mit dem Widget gerendert."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Die Ebene, mit der das Widget verknüpft werden soll."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/de/OrchardCore.Liquid.po b/Localization/de/OrchardCore.Liquid.po
index 9fd48e544a7c0..df74a5d67f865 100644
--- a/Localization/de/OrchardCore.Liquid.po
+++ b/Localization/de/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/de/OrchardCore.Lists.po b/Localization/de/OrchardCore.Lists.po
index 92acbf54c85b9..310dd2a6ebda9 100644
--- a/Localization/de/OrchardCore.Lists.po
+++ b/Localization/de/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Stellt einen Link zum übergeordneten Inhaltselement dar, sowie die Reihenfolge der Dartellung des Inhaltselement."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Stellt eine Sammlung von Inhaltselementen dar."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Der angegebene Blog-Beitrag existiert nicht mehr. Bitte erstellen Sie einen neuen Blog-Beitrag."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Nicht berechtigt, diesen Inhalt zu löschen"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Der angegebene Benutzername oder E-Mail oder Passwort ist falsch."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Die Liste ist leer"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Wählen Sie diese Option, um die manuelle Sortierung von Einträgen zu aktivieren."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Listen"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Übergeordneter Menü-Eintrag"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/de/OrchardCore.Localization.po b/Localization/de/OrchardCore.Localization.po
index bcec8f442ff86..c0f3955009a2f 100644
--- a/Localization/de/OrchardCore.Localization.po
+++ b/Localization/de/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Ländereinstellung"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Eine Kultur ist erforderlich"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Die aktiven Kulturen, die für die Website konfiguriert sind."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Kultur hinzufügen"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/de/OrchardCore.Markdown.po b/Localization/de/OrchardCore.Markdown.po
index 21bd259958266..d1e289b1b2f5b 100644
--- a/Localization/de/OrchardCore.Markdown.po
+++ b/Localization/de/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg Editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Der Inhalt des Inhalts im Markdown-Format."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg Editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/de/OrchardCore.Media.po b/Localization/de/OrchardCore.Media.po
index e94afa97f75a7..1d400e94949d0 100644
--- a/Localization/de/OrchardCore.Media.po
+++ b/Localization/de/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Medien können nicht verschoben werden, da eine Datei bereits mit dem gleichen Namen existiert"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Ein Profile mit diesem Namen existiert bereits."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Medienprofil erfolgreich gelöscht."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Medienprofil erfolgreich gelöscht."
@@ -181,95 +181,95 @@ msgstr "Medienprofil erfolgreich gelöscht."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Standard"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Benutzerdefinierte Größe"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Standard (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Max"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Zuschneiden"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Pad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "BoxPad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Min"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Vergrößern"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "JPG"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "PNG"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Es gab einen Fehler beim Umgang mit den Dateien."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Ob die Assets nur aus dem obersten Verzeichnis oder aus allen Unterverzeichnissen abgerufen werden sollen."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Umkehren"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Ordner erstellen"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Eintrag umbenennen"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Medien"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Exportiert alle oder ausgewählte Medien."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Kleine Thumbnails"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Große Thumbnails"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Angehängt"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Kleine Thumbnails"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Große Thumbnails"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Medien auswählen"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/de/OrchardCore.Menu.po b/Localization/de/OrchardCore.Menu.po
index 2520d0c62772f..1c55978cfdaaf 100644
--- a/Localization/de/OrchardCore.Menu.po
+++ b/Localization/de/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menüs"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "{0} bearbeiten"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/de/OrchardCore.Microsoft.Authentication.po b/Localization/de/OrchardCore.Microsoft.Authentication.po
index ab8b80f6bb04b..259edd697c328 100644
--- a/Localization/de/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/de/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Microsoft-Account-Authentifizierungseinstellungen"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "Die Anwendungs-ID wurde in den Parametern des Microsoft-Entwicklerportals gefunden."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Der Schlüssel (Secret-Key) wurde in den Parametern des Microsoft developer Portals gefunden."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/de/OrchardCore.Navigation.po b/Localization/de/OrchardCore.Navigation.po
index ca10dc54912ba..b3e6b6fade96d 100644
--- a/Localization/de/OrchardCore.Navigation.po
+++ b/Localization/de/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/de/OrchardCore.Notifications.po b/Localization/de/OrchardCore.Notifications.po
index 63ef6ebc86444..b81fddaba50a4 100644
--- a/Localization/de/OrchardCore.Notifications.po
+++ b/Localization/de/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/de/OrchardCore.OpenId.po b/Localization/de/OrchardCore.OpenId.po
index e4f7463ec46da..089f9175d7b82 100644
--- a/Localization/de/OrchardCore.OpenId.po
+++ b/Localization/de/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Der Name wird bereits von einem anderen Scope verwendet."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "OpenID-Server-Konfiguration erfolgreich aktualisiert."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "OpenID-Server-Konfiguration erfolgreich aktualisiert."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Eine neue Anwendung erstellen"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Client-ID"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Geschützte Anwendungen MÜSSEN ihr Client-secret bei der Kommunikation mit dem Token und Widerrufsendpunkt mit senden. Dies garantiert, dass nur der bekannte Client einen Autorisierungscode tauschen kann oder ein Aktualisierungstoken erhält."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Refresh Token Flow erlauben"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Logout-Endpunkt erlauben"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Neuen Bereich erstellen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Anwendung bearbeiten"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Client-ID"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Geschützte Anwendungen MÜSSEN ihr Client-secret bei der Kommunikation mit dem Token und Widerrufsendpunkt mit senden. Dies garantiert, dass nur der bekannte Client einen Autorisierungscode tauschen kann oder ein Aktualisierungstoken erhält."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Refresh Token Flow erlauben"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Bereich bearbeiten"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Der aktuelle Tenant wird neu geladen, wenn die Einstellungen gespeichert werden."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Anzeigename des Id Providers"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Autorität für OpenIdConnect Anrufe"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "die 'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Der Requestpfad innerhalb des Anwendungspfads, wohin der User-Agent weitergeleitet werden wird. Die Middleware wird die Anfrage verarbeiten, sobald sie ankommt."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Siehe post_logout_redirect_uri von "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "Der Uri, wohin der User-Agent nach der Abmeldung vom Identity Provider weitergeleitet wird. Die Umleitung erfolgt nach dem Aufruf des SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Code Authentifizierung Flow"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "siehe: "
@@ -1217,15 +1217,15 @@ msgstr "Antwort-Typ 'Code' verwenden"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "beispiel:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Antworttyp 'Code Token' verwenden"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Implizierter Authentifizierungsfluss"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "'id_token' Antworttyp verwenden"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Antworttyp 'id_token Token' verwenden"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Antwort-Modus"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Den Antwort-Modus konfigurieren, siehe: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "Client Secret setzen."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Diese Optionen sind alle optional und gelten nur für fortgeschrittene Benutzer."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "Die Basis-URL des Identitätsservers (diese Seite). Wenn kein Wert angegeben wird, wird automatisch ein Standardwert basierend auf dem Site-Host berechnet."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Sie müssen ein Zertifikat zu Ihrem Server hinzufügen, um das OpenID Connect-Modul einzurichten."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Der aktuelle Mandant wird neu geladen, wenn die Einstellungen gespeichert werden."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Autorisierungsservermandant"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "Die Adresse des entfernten OpenID Connect Servers. Eine HTTPS-Adresse ist ausdrücklich empfohlen."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/de/OrchardCore.Placements.po b/Localization/de/OrchardCore.Placements.po
index c65505cb82012..971c771dc30ac 100644
--- a/Localization/de/OrchardCore.Placements.po
+++ b/Localization/de/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/de/OrchardCore.ProjectTemplates.po b/Localization/de/OrchardCore.ProjectTemplates.po
index 3176adb868fcd..212b696c4d0f1 100644
--- a/Localization/de/OrchardCore.ProjectTemplates.po
+++ b/Localization/de/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Anzeigen"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/de/OrchardCore.PublishLater.po b/Localization/de/OrchardCore.PublishLater.po
index c1601b90c7ec7..2cbc81203819f 100644
--- a/Localization/de/OrchardCore.PublishLater.po
+++ b/Localization/de/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Später veröffentlichen"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Später veröffentlichen abbrechen"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/de/OrchardCore.Queries.po b/Localization/de/OrchardCore.Queries.po
index f8fbdd487bf43..ccb498340b9dc 100644
--- a/Localization/de/OrchardCore.Queries.po
+++ b/Localization/de/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "SQL-Abfrage ausführen"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Fehler beim Ausführen der Abfrage: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL-Abfrage"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "Die SQL-Abfrage verwendet die Standard-SQL92 Syntax und wird basierend auf der aktuellen Datenbank konvertiert. Tabellen werden automatisch mit Präfixen versehen."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Abfrage"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Der technische Name der Anfrage."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Wenn aktiviert, muss das Ergebnis eine Liste von Dokumenten-Ids sein."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/de/OrchardCore.ReCaptcha.Core.po b/Localization/de/OrchardCore.ReCaptcha.Core.po
index 2623570bef98d..201db1df94153 100644
--- a/Localization/de/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/de/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Captcha konnte nicht überprüft werden"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Captcha konnte nicht überprüft werden"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Sprache mit Namen {0} nicht gefunden"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/de/OrchardCore.ReCaptcha.po b/Localization/de/OrchardCore.ReCaptcha.po
index 947c99f07e3fe..0922ab624b89c 100644
--- a/Localization/de/OrchardCore.ReCaptcha.po
+++ b/Localization/de/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Exportiert die ReCaptcha-Einstellungen."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "ReCaptcha Task validieren"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validierung"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Gültig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Ungültig"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Captcha Validierung fehlgeschlagen. Versuche es erneut."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Der aktuelle Mandant wird neu geladen, wenn die Einstellungen gespeichert werden."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Der reCaptcha Site Key von Google."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/de/OrchardCore.Recipes.Core.po b/Localization/de/OrchardCore.Recipes.Core.po
index cd757fb014126..91adcbc8cd9fb 100644
--- a/Localization/de/OrchardCore.Recipes.Core.po
+++ b/Localization/de/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/de/OrchardCore.Roles.po b/Localization/de/OrchardCore.Roles.po
index a47fab316b30e..9dd4affafd290 100644
--- a/Localization/de/OrchardCore.Roles.po
+++ b/Localization/de/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Rollen"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Ungültiger Rollenname."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rolle erfolgreich aktualisiert."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Systemrollen können nicht gelöscht werden."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Rolle erstellen"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Rollenname"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Rollendetail bearbeiten"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Berechtigung"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Diese Berechtigung könnte es einem Benutzer erlauben, seine anderen Berechtigungen zu erhöhen. Nur nach reichlicher Überlegung erteilen."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Abbrechen"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Rollen"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/de/OrchardCore.Rules.po b/Localization/de/OrchardCore.Rules.po
index c21fa504f364a..81c6295447ea2 100644
--- a/Localization/de/OrchardCore.Rules.po
+++ b/Localization/de/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/de/OrchardCore.Search.Elasticsearch.po b/Localization/de/OrchardCore.Search.Elasticsearch.po
index b2227dd948c6c..1f4e45ce9df24 100644
--- a/Localization/de/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/de/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/de/OrchardCore.Search.Lucene.po b/Localization/de/OrchardCore.Search.Lucene.po
index bf264cdb58ec8..50b74bed7eba3 100644
--- a/Localization/de/OrchardCore.Search.Lucene.po
+++ b/Localization/de/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/de/OrchardCore.Search.po b/Localization/de/OrchardCore.Search.po
index 4b530f31380a8..dc6d066d32815 100644
--- a/Localization/de/OrchardCore.Search.po
+++ b/Localization/de/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/de/OrchardCore.Security.po b/Localization/de/OrchardCore.Security.po
index a3fae637cf8f8..e0dca916051da 100644
--- a/Localization/de/OrchardCore.Security.po
+++ b/Localization/de/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/de/OrchardCore.Seo.po b/Localization/de/OrchardCore.Seo.po
index a8aa6b168b8c4..a7e4ae956f913 100644
--- a/Localization/de/OrchardCore.Seo.po
+++ b/Localization/de/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/de/OrchardCore.Settings.po b/Localization/de/OrchardCore.Settings.po
index e7ccc3831b5ef..d8ff70f8d851d 100644
--- a/Localization/de/OrchardCore.Settings.po
+++ b/Localization/de/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Seiten-Einstellungen erfolgreich aktualisiert."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Die Basis-URL muss eine voll qualifizierte URL sein."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/de/OrchardCore.Setup.Core.po b/Localization/de/OrchardCore.Setup.Core.po
index 0e3b6ef3a9b04..6f4260e3bb358 100644
--- a/Localization/de/OrchardCore.Setup.Core.po
+++ b/Localization/de/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/de/OrchardCore.Setup.po b/Localization/de/OrchardCore.Setup.po
index d41b40db5bf26..73fd48553f79d 100644
--- a/Localization/de/OrchardCore.Setup.po
+++ b/Localization/de/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Das Passwort muss mindestens {0} enthalten."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Es ist nicht möglich, eine Website ohne Rezept einzurichten."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Dies wird als Standardtitel Ihrer Seiten verwendet."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Rezepte erlauben es Ihnen, Ihre Website mit zusätzlichen, vorkonfigurierten Optionen, Funktionen und Einstellungen zu installieren."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Bestimmt die Standardzeitzone, die bei der Anzeige und Bearbeitung von Daten und Zeiten verwendet wird."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Die Datenbank wird verwendet, um die Konfiguration und den Inhalt der Website zu speichern."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Sie können einen Tabellenpräfix angeben, wenn Sie die gleiche Datenbank für mehrere Webseiten wiederverwenden möchten."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Verbindungszeichenkette anzeigen/ausblenden"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Der Superuser hat alle Rechte. Er sollte nur während der Einrichtung und für die Katastrophenwiederherstellung verwendet werden."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Benutzername"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Diese E-Mail-Adresse ist ungültig."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Passwortstärke"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/de/OrchardCore.Shortcodes.po b/Localization/de/OrchardCore.Shortcodes.po
index aee965cf08321..b53be7ad261bb 100644
--- a/Localization/de/OrchardCore.Shortcodes.po
+++ b/Localization/de/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Der Inhalt der Vorlage ist obligatorisch."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Die Vorlage enthält keinen gültigen Liquid-Ausdruck. Details: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Kurzcode Vorlage erfolgreich gelöscht."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Kurzcode Vorlage erfolgreich entfernt."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/de/OrchardCore.Sitemaps.po b/Localization/de/OrchardCore.Sitemaps.po
index 5df6f1f8fe67a..356f673f2f013 100644
--- a/Localization/de/OrchardCore.Sitemaps.po
+++ b/Localization/de/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Die Einstellung 'Basis-Url' ist leer, wird aber benötigt, um Sitemaps zu generieren."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Die Einstellung 'Basis-URL' ist leer, wird aber benötigt, um Sitemaps zu generieren."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Deaktivieren, um das Routen zum Sitemap Index zu deaktivieren."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Die Einstellung 'Basis-URL' ist leer, wird aber benötigt, um Sitemaps zu generieren."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Die Einstellung 'Basis-Url' ist leer, wird aber benötigt, um Sitemaps zu generieren."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Deaktivieren, um das Routen zum Sitemap Index zu deaktivieren."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Auswählen, um dieses Inhaltselement von der Sitemap auszuschließen."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Die Häufigkeit, in der sich dieser Inhalt voraussichtlich ändern wird."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/de/OrchardCore.Sms.po b/Localization/de/OrchardCore.Sms.po
index 6421f5e7d234c..649054c70fc1a 100644
--- a/Localization/de/OrchardCore.Sms.po
+++ b/Localization/de/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/de/OrchardCore.Spatial.po b/Localization/de/OrchardCore.Spatial.po
index 2debd62db0ad1..f55dd33592f4b 100644
--- a/Localization/de/OrchardCore.Spatial.po
+++ b/Localization/de/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/de/OrchardCore.Taxonomies.po b/Localization/de/OrchardCore.Taxonomies.po
index eaf71e2b3e6b0..c42278ca22c58 100644
--- a/Localization/de/OrchardCore.Taxonomies.po
+++ b/Localization/de/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Ein Wert ist für '{0} 'erforderlich"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Stichwörter"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Die Taxonomie konnte nicht gefunden werden. Bitte überprüfen Sie die Einstellungen für dieses Feld."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Fehler beim Erstellen des Stichworts"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Tippen, um zu suchen"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Auswählen"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Entfernen"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Drücke Enter um ein Stichwort zu erstellen"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Keine Stichwörter gefunden"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Stichwörter"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Die Taxonomie konnte nicht gefunden werden. Bitte überprüfen Sie die Einstellungen für dieses Feld."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Der Hinweistext, der für dieses Feld im Editor angezeigt wird."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonomie"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Erforderlich"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Ob mindestens ein Element ausgewählt ist."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Einzigartig"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Gibt an, ob nur ein Element ausgewählt werden kann."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Nur Blätter"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Gibt an, ob nur Unterelemente ausgewählt werden können."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Gibt an, ob direkt neue Stichwörter erstellt werden können. Notiz: Wenn Stichwörter direkt erstellt werden, wird nur die Anzeigetext-Eigenschaft gesetzt."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Begriff-Inhaltstyp"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "{0} hinzufügen"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Sie haben die Taxonomie neu geordnet."
diff --git a/Localization/de/OrchardCore.Templates.Cms.Module.po b/Localization/de/OrchardCore.Templates.Cms.Module.po
index 624d87d363f39..c4e22cb756383 100644
--- a/Localization/de/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/de/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Anzeigen"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/de/OrchardCore.Templates.po b/Localization/de/OrchardCore.Templates.po
index 0f8a97f56f861..c0c3a8c0b2290 100644
--- a/Localization/de/OrchardCore.Templates.po
+++ b/Localization/de/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Vorschau"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Der Name der Vorlage."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Die Beschreibung der Vorlage."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Vorschau"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Der Name der Vorlage."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Die Beschreibung der Vorlage."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/de/OrchardCore.Tenants.po b/Localization/de/OrchardCore.Tenants.po
index 6b90d62df2dd8..7056eb670d460 100644
--- a/Localization/de/OrchardCore.Tenants.po
+++ b/Localization/de/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Mandanten"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Alle Zustände"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Laufend"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Deaktiviert"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Uninitialisiert"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Status"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Deaktivieren"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Aktivieren"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Sie können den Standard-Mandant nicht deaktivieren."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Der Mandant '{0}' ist bereits deaktiviert."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Der Mandant '{0}' ist bereits aktiviert."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Sie können nur einen deaktivierten Mandanten aktivieren."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Mandant nicht gefunden: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Der Mandant kann nicht eingerichtet werden."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Der Datenbankanbieter ist nicht definiert."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Die Verbindungszeichenkette ist für diesen Datenbankanbieter vorausgesetzt."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Entweder 'Rezept' oder 'Rezeptname' ist erforderlich."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Rezept '{0}' nicht gefunden."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Mandantenaufgabe erstellen"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Mandant erstellen"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Wählen Sie den Namen des zu erstellenden Mandanten aus."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Optional) Die Beschreibung des zu erstellenden Mandanten."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Beispiel: Wenn der Host \"orchardproject.net\" ist, lautet die URL der Mandantenseite \"http://orchardproject.net/\"."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Welche Art von Datenbank möchten Sie verwenden?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tabellen-Präfix"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Verbindungszeichenkette"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Rezept"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Mandant deaktivieren"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Mandant bearbeiten"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Mandant aktivieren"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Einen Mandant aktivieren."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Mandant einrichten"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Wählen Sie den Namen des einzurichtenden Mandanten."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Seitenname"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Administrator-Benutzername"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Administrator E-Mail-Adresse"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Administratorpasswort"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Welche Art von Datenbank möchten Sie verwenden?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tabellen-Präfix"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Verbindungszeichenkette"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/de/OrchardCore.Tests.po b/Localization/de/OrchardCore.Tests.po
index 1cae9a9a12613..2052f01503fc6 100644
--- a/Localization/de/OrchardCore.Tests.po
+++ b/Localization/de/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/de/OrchardCore.Themes.po b/Localization/de/OrchardCore.Themes.po
index 147b5c5b501d0..8f0726037ddd8 100644
--- a/Localization/de/OrchardCore.Themes.po
+++ b/Localization/de/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exportiert das aktuell ausgewählte Seiten- und Administrator-Design."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/de/OrchardCore.Title.po b/Localization/de/OrchardCore.Title.po
index 934d41da853e1..146960cea6a61 100644
--- a/Localization/de/OrchardCore.Title.po
+++ b/Localization/de/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Ein Wert wird für den Titel benötigt."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Muster enthält keinen gültigen Liquid-Ausdruck. Details: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Der Titel wird unter Verwendung des Musters automatisch generiert."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Auswählen, um den Titel in den Anzeigeansichten zu rendern."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/de/OrchardCore.Twitter.po b/Localization/de/OrchardCore.Twitter.po
index a48b63eb91400..eb207dadd032a 100644
--- a/Localization/de/OrchardCore.Twitter.po
+++ b/Localization/de/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Zugangs-Token-Geheimnis ist erforderlich"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Twitter-Statusaufgabe aktualisieren"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Fehlgeschlagen"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Der aktuelle Mandant wird neu geladen, wenn die Einstellungen gespeichert werden."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Twitter-Integration-Einstellungen"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API-Schlüssel"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Der API-Schlüssel, der im Schlüssel- und Token-Tab des Dashboards der Twitter-App definiert ist."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "API Geheimschlüssel"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Das API-Geheimnis, welches im Schlüssel- und Token-Tab des Dashboards der Twitter-App definiert ist."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Zugangs-Token"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Der Zugangs-Token, der im Schlüssel- und Token-Tab des Dashboards der Twitter-App definiert ist."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Zugangs-Token-Geheimnis"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Das Zugangs-Token-Geheimnis, welches im Schlüssel- und Token-Tab des Dashboards der Twitter-App definiert ist."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Mit Twitter-Einstellungen anmelden"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Twitter-Status aktualisieren"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/de/OrchardCore.Users.Core.po b/Localization/de/OrchardCore.Users.Core.po
index 8a182d6f6fc14..c78ee7c174c77 100644
--- a/Localization/de/OrchardCore.Users.Core.po
+++ b/Localization/de/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-Mail '{0}' ist ungültig."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Unerwarteter Fehler: '{0}'."
diff --git a/Localization/de/OrchardCore.Users.po b/Localization/de/OrchardCore.Users.po
index 861732159c117..b94d273293fbf 100644
--- a/Localization/de/OrchardCore.Users.po
+++ b/Localization/de/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Benutzer erfolgreich erstellt"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Lokale Anmeldung ist deaktiviert."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Das Konto ist gesperrt"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Ungültiger Login-Versuch."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Ihr Passwort wurde erfolgreich geändert."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Beim externen Anbieter ist ein Fehler aufgetreten."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Website erlaubt keine Benutzerregistrierung."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Bestätigen Sie Ihren Account"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Der angegebene Benutzer darf sich nicht anmelden."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Sie müssen Ihre E-Mail-Adresse bestätigen."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Alle Benutzer"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Aktivierte Benutzer"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Deaktivierte Benutzer"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Name"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "E-Mail-Adresse"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Genehmigen"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Aktivieren"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Deaktivieren"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Löschen"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Alle Rollen"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Authentifiziert (keine Rollen)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Benutzer {0} erfolgreich genehmigt."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Benutzer {0} erfolgreich gelöscht."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Benutzer {0} erfolgreich deaktiviert."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Benutzer {0} erfolgreich aktiviert."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Benutzer erfolgreich erstellt."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Benutzer erfolgreich aktualisiert."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Benutzer erfolgreich gelöscht."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Benutzer konnte nicht gelöscht werden."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Passwort korrekt aktualisiert."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Benutzer erfolgreich freigeschaltet."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Benutzer konnte nicht freigeschaltet werden."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Anmeldeeinstellungen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exportiert die Anmeldeeinstellungen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "E-Mail-Einstellungen ändern"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exportiert die Änderungs-E-Mail-Einstellungen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Registrierungseinstellungen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exportiert die Registrierungseinstellungen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Passworteinstellungen zurücksetzen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exportiert die Einstellungen zum Zurücksetzen des Passworts."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Das neue Passwort und das Bestätigungspasswort stimmen nicht überein."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Benutzerrolle zuweisen-Aufgabe"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Benutzer"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Benutzer registrieren-Aufgabe"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Gültig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Ungültig"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Kein E-Mail-Dienst verfügbar"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Benutzer aktualisiert-Ereignis"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} zur Rolle {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Der zuzuweisende Benutzer. Mit Liquid-Unterstützung."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Kennwort ändern"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Aktuelles Kennwort"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Neues Kennwort"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Benutzer erstellen"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Passwort ändern"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "E-Mail-Adresse ändern"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Sie haben sich erfolgreich mit <strong>{0}</strong> authentifiziert. Sie haben bereits ein Konto mit dieser E-Mail-Adresse. Geben Sie Ihr lokales Kennwort ein und klicken Sie auf Registrieren, um die Konten zu verknüpfen und die Anmeldung abzuschließen."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Benutzername"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "E-Mail-Adresse"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Anmelden"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Neues Konto anlegen."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Benutzername"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "E-Mail-Adresse"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Passwort"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Sie haben sich erfolgreich mit <strong>{0}</strong> authentifiziert. Bitte füllen Sie das untenstehende Formular aus und klicken Sie auf die Schaltfläche Registrieren, um die Registrierung abzuschließen."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Benutzername"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "E-Mail-Adresse"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Kennwort"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Bestätigungs-E-Mail senden"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Das Thema der Nachricht. Unterstützt die Liquid-Syntax."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "E-Mail-Adresse"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Der Benutzer ist deaktiviert."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Der Benutzer ist aktiviert."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Deaktivieren, um dieses Benutzerkonto zu deaktivieren."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/de/OrchardCore.Widgets.po b/Localization/de/OrchardCore.Widgets.po
index 3b479802f693f..3e63915e8ea2e 100644
--- a/Localization/de/OrchardCore.Widgets.po
+++ b/Localization/de/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Widget hinzufügen"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/de/OrchardCore.Workflows.po b/Localization/de/OrchardCore.Workflows.po
index 8cda250224956..1e22cfb42d350 100644
--- a/Localization/de/OrchardCore.Workflows.po
+++ b/Localization/de/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Transaktion durchführen-Aufgabe"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Korrelieren-Aufgabe"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Grundelemente"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Für jede Aufgabe"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Iterieren"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Aufspalten-Aufgabe"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "For-Schleife-Aufgabe"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Iterieren"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Wenn-Dann-Aufgabe"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Richtig"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Falsch"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Aufgabe beitreten"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Beigetreten"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Protokollieren-Aufgabe"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Grundelemente"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Erledigt"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Ausnahmen"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Benachrichtigen-Aufgabe"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Benutzeroberfläche"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Skript-Aufgabe"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Ergebniswert setzen-Aufgabe"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Grundelemente"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Eigenschaft setzen-Aufgabe"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Grundelemente"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "While-Schleife-Aufgabe"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Steuerungsfluss"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Iterieren"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Erledigt"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Kürzlich hinzugefügt"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Zuletzt erstellt"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Fehlgeschlagen"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Fertiggestellt"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Löschen"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Workflow {0} wurde gelöscht."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Löschen"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Workflow {0} wurde gelöscht."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Http-Weiterleitung-Aufgabe"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Erledigt"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Http-Anfrage-Event"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Erledigt"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Passend"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Http-Anfrage-Aufgabe"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Unbehandelter Http-Status"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Http-Antwort-Aufgabe"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Erledigt"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Startaufgabe"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Korrelieren"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Zurück"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Löschen"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Verfügbare Ereignisse"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Verfügbare Aufgaben"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Sind Sie sicher, dass Sie diese Aktivität löschen möchten?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtern"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Iterieren Sie <em>{0}</em> über <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Die zu iterierende Liste. Mit JavaScript-Unterstützung."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Keine Aufspaltungen"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Iterieren Sie <em>{0}</em> von <em>{1}</em> bis <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Der Anfangswert. Mit JavaScript-Unterstützung."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Der Endwert. Mit JavaScript-Unterstützung."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Der Schleifenschritt-Wert. Mit JavaScript-Unterstützung."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "HTTP Weiterleitung"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "Die URL, auf welche umgeleitet werden soll. Mit Liquid-Unterstützung."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Auswählen, wenn die Umleitung permanent sein soll (301). Nicht auswählen für eine temporäre Weiterleitung (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Eingehende HTTP-Anfrage bearbeiten"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Jeder, der diese URL aufruft, wird diesen Workflow auslösen. Geben Sie diese nicht unnötig weiter."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Antifälschungs-Token überprüfen"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Deaktivieren Sie diese Option, wenn die Anfrage von einem Dienst kommt, der diese URL als Webhook aufruft. Wenn diese URL von einem Formular angefordert wird, lassen Sie diese Option aktiviert, um sicherzustellen, dass die Formularwerte nicht manipuliert wurden."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Token Lebensspanne"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Drücken Sie den <b>Regeneriere</b>-Button nach dem Ändern dieses Werts."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Anzahl der Tage, bis der Token ablaufen sollen. 0 damit der Token nie ablaufen kann"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Eingehende HTTP-Anfrage filtern"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Die zugehörige HTTP-Methode."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Der zugehörige Controller-Name."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Der zugehörige Name der Aktion."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "Die URL, an die die Anfrage gesendet wird. Unterstützt Liquid-Syntax."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "Die HTTP-Methode. Zum Beispiel: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Der Inhaltstyp des Anfrage-Body."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Der Body mit dem POST, PUT und PATCH Anfragen gesendet werden sollen."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Bieten Sie zusätzliche HTTP-Header, einen pro Zeile. Zum Beispiel: Autorisierung: Bearer 123ABC. Mit Liquid-Unterstützung."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP-Antwort"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Der HTTP-Statuscode für die Rücksendung. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Klicken Sie hier</a> für eine vollständige Liste."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Der Inhaltstyp des Antwort-Body."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Der zurückzusendende Body. Mit Liquid-Unterstützung."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Auswerten von <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Sortieren"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Löschen"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Erstellt {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Nichts hier!</strong> Im Moment gibt es keine gestoppten Workflows."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Zurück"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "ausgewählt"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 Instanz"
-msgstr[1] "{0} Instanzen"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Erwarten Sie <strong>irgendwelche</strong> eingehenden Aktivitäten, bevor Sie die Ausführung in einen einzigen Pfad zusammenführen."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Der Log-Level."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} Benachrichtigung"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Der Benachrichtigungstyp."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Skript"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Eine kommaseparierte Liste der verfügbaren Ergebnisse."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Ausgabe über {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Der auszugebende Name."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "{0} Eigenschaft festlegen"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Die Eigenschaft, die gesetzt werden soll. Wenn die angegebene Eigenschaft noch nicht existiert, wird sie hinzugefügt."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Wenn <em>{0}</em> ausgelöst wird"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Keine Benutzeraktionen angegeben"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Geben Sie einen oder mehrere kommaseparierte Aktionsnamen ein."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Schleife solange ausführen bis <em>{0}</em> wahr ist"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Iterieren, solange eine Bedingung wahr ist."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/de/TheAdmin.po b/Localization/de/TheAdmin.po
index 248e447dde1e3..f778cd2dc1ee1 100644
--- a/Localization/de/TheAdmin.po
+++ b/Localization/de/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Helles Design"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Dunkles Design"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Website besuchen"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Menü verkleinern / erweitern"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Löschen"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Sind Sie sicher, dass Sie diese Element entfernen möchten?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/de/TheAgencyTheme.po b/Localization/de/TheAgencyTheme.po
index c359e77913e2c..90665aea907b2 100644
--- a/Localization/de/TheAgencyTheme.po
+++ b/Localization/de/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Solche Ergebnisse gibt es nicht."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Seite nicht gefunden"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Die angeforderte Seite konnte nicht gefunden werden."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/de/TheBlogTheme.po b/Localization/de/TheBlogTheme.po
index 4feb2e7bd071c..45e77fde8b950 100644
--- a/Localization/de/TheBlogTheme.po
+++ b/Localization/de/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "am {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Solche Ergebnisse gibt es nicht."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Seite nicht gefunden"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/de/TheTheme.po b/Localization/de/TheTheme.po
index 0c2a08fb289a7..f698377048cfe 100644
--- a/Localization/de/TheTheme.po
+++ b/Localization/de/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Willkommen zu Orchard Core, Ihre Webseite wurde erfolgreich eingerichtet."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/el/OrchardCore.Admin.po b/Localization/el/OrchardCore.Admin.po
index 886c53f8c213e..67886adf996b3 100644
--- a/Localization/el/OrchardCore.Admin.po
+++ b/Localization/el/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Διαχειριστής"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Ρυθμίσεις Διαχειριστή"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Εξάγει τις ρυθμίσεις διαχειριστή."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Καλώς ήρθατε στο Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Μπορείτε να περιηγηθείτε στο μενού και να ανακαλύψετε όλες τις δυνατότητές του."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Ενεργοποίηση σκοτεινής λειτουργίας θέμα διαχειριστή"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Αν ένα σκούρο θέμα διαχειριστή μπορεί να εμφανιστεί."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Εάν οι τίτλοι θα εμφανίζονται στην επάνω γραμμή."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Διαχειριστής"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/el/OrchardCore.AdminDashboard.po b/Localization/el/OrchardCore.AdminDashboard.po
index acc7aedc7a871..e1097451bafb1 100644
--- a/Localization/el/OrchardCore.AdminDashboard.po
+++ b/Localization/el/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "'Οχι"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Θέση"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Πλάτος"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/el/OrchardCore.AdminMenu.po b/Localization/el/OrchardCore.AdminMenu.po
index fd3074401f687..c20653e03c573 100644
--- a/Localization/el/OrchardCore.AdminMenu.po
+++ b/Localization/el/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Δημιουργία Μενού Διαχειριστή {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Δημιουργία Κόμβου"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Επεξεργασία Μενού Διαχειριστή: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Επεξεργασία Κόμβου"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Η προτεραιότητα αυτού του συνδέσμου πρέπει να εμφανίζεται ως ενεργή αντί για κάπου άλλου όταν και τα δύο δείχνουν την ίδια διεύθυνση url. Ο σύνδεσμος με την υψηλότερη τιμή έχει την ενεργή κατάσταση στην πλοήγηση."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Η θέση ταξινόμησης αυτού του συνδέσμου στο μενού διαχείρισης."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Σύνδεσμος"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Το Κείμενο Συνδέσμου όπως θα εμφανιστεί στο δέντρο."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Η διεύθυνση του συνδέσμου. Ο σύνδεσμος θα εμφανιστεί μόνο αν κάποιο από τα παιδιά του έχει μια διεύθυνση url. Η διεύθυνση url θα είναι σχετική με τη ρίζα της τοποθεσίας διαχειριστή"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Διαλέξτε εικονίδιο"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Υποκατάστατο"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Το κείμενο του μενού όπως θα εμφανιστεί στο δέντρο."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Διαλέξτε"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Επιλέξτε ένα εικονίδιο για εμφάνιση όταν αυτό το αντικείμενο του μενού βρίσκετε στη κορυφή."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Διαλέξτε εικονίδιο"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Πληκτρολόγησε για αναζήτηση"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Επιλογή"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Δε βρέθηκαν αποτελέσματα"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Τα δικαιώματα που απαιτούνται για την εμφάνιση αυτού του στοιχείου μενού (προαιρετικά)."
diff --git a/Localization/el/OrchardCore.Alias.po b/Localization/el/OrchardCore.Alias.po
index c0807c6aa4791..1f6d1ef5ac02f 100644
--- a/Localization/el/OrchardCore.Alias.po
+++ b/Localization/el/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "Το ψευδώνυμό αυτό χρησιμοποιείται ήδη. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Το μοτίβο δεν περιέχει μια έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Αφήστε το, κενό για να επαναδημιουργηθεί."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Το ψευδώνυμο είναι δημιουργημένο και η είσοδος είναι απενεργοποιημένη"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/el/OrchardCore.Apis.GraphQL.po b/Localization/el/OrchardCore.Apis.GraphQL.po
index 1c0962a412d28..b45432060f645 100644
--- a/Localization/el/OrchardCore.Apis.GraphQL.po
+++ b/Localization/el/OrchardCore.Apis.GraphQL.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:43\n"
+"PO-Revision-Date: 2023-10-25 12:12\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Apis.GraphQL\AdminMenu.cs:25
@@ -30,7 +30,7 @@ msgstr "GraphiQL"
 #: OrchardCore.Apis.GraphQL\ValidationRules\MaxNumberOfResultsValidationRule.cs:54
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.MaxNumberOfResultsValidationRule"
 msgid "'{0}' exceeds the maximum number of results for '{1}' ({2})"
-msgstr ""
+msgstr "Το '{0}' υπερβαίνει τον μέγιστο αριθμό αποτελεσμάτων για το '{1}' ({2})"
 
 #. S["Authorization is required to access {0}.", operationName],
 #: OrchardCore.Apis.GraphQL\ValidationRules\RequiresPermissionValidationRule.cs:67
diff --git a/Localization/el/OrchardCore.ArchiveLater.po b/Localization/el/OrchardCore.ArchiveLater.po
index 8900614fa97c3..cb1b60deb7a52 100644
--- a/Localization/el/OrchardCore.ArchiveLater.po
+++ b/Localization/el/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-03-29 14:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "Αρχειοθετήστε αργότερα"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "Ακύρωση της αρχειοθέτησης αργότερα"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/el/OrchardCore.AuditTrail.po b/Localization/el/OrchardCore.AuditTrail.po
index 1872eca481d56..98be3a831c2e9 100644
--- a/Localization/el/OrchardCore.AuditTrail.po
+++ b/Localization/el/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Διαδρομή Ελέγχου"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Όλες οι κατηγορίες"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Προσαρμοσμένο εύρος ωρών"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Διαδρομή Ελέγχου"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Εάν η εργασία περικοπής είναι απενεργοποιημένη."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Ο αριθμός των ημερών που διατηρείται ένα συμβάν."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/el/OrchardCore.Autoroute.po b/Localization/el/OrchardCore.Autoroute.po
index d662b26c9c8a1..ba1350e83cfd3 100644
--- a/Localization/el/OrchardCore.Autoroute.po
+++ b/Localization/el/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Ο μόνιμος σύνδεσμος σας είναι πολύ μεγάλος. Ο μόνιμος σύνδεσμος μπορεί να είναι μόνο μέχρι {0} χαρακτήρες."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Επιλέξτε για απενεργοποίηση της αυτόματης διαδρομής για αυτό το στοιχείο περιεχομένου."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Επιλέξτε για να καθορίσετε ότι ένα θυγατρικό στοιχείο περιεχομένου θα δρομολογηθεί σε απόλυτη διαδρομή."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/el/OrchardCore.BackgroundTasks.po b/Localization/el/OrchardCore.BackgroundTasks.po
index adffcd40b9d22..6b8c17cc87fd1 100644
--- a/Localization/el/OrchardCore.BackgroundTasks.po
+++ b/Localization/el/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-22 07:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "Τίτλος"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "Περιγραφή"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -122,7 +122,7 @@ msgstr ""
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:53
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Whether or not the tenant pipeline should be built to configure endpoints and then executed to allow route urls generation in the background."
-msgstr ""
+msgstr "Εάν η διοχέτευση ενοικιαστή θα πρέπει να κατασκευαστεί ή όχι, για να διαμορφώσει τα τελικά σημεία και στη συνέχεια να εκτελεστεί ώστε να επιτρέπεται η δημιουργία url διαδρομής στο παρασκήνιο."
 
 #. <div><span asp-validation-for="LockTimeout" class="text-danger">@T["Invalid lock timeout value in the advanced tab"]</span></div>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:57
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Μη έγκυρη τιμή λήξης κλειδώματος στην καρτέλα για προχωρημένους"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Αγνοείται εάν δεν είναι ενεργοποιημένη η δυνατότητα κατανεμημένου κλειδώματος."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/el/OrchardCore.ContentFields.po b/Localization/el/OrchardCore.ContentFields.po
index e87db4e7ce750..6b55f1448deab 100644
--- a/Localization/el/OrchardCore.ContentFields.po
+++ b/Localization/el/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -308,7 +308,7 @@ msgstr "Η μορφή της διεύθυνσης url δεν είναι έγκυ
 #: OrchardCore.ContentFields\Settings\ContentPickerFieldSettingsDriver.cs:80
 msgctxt "OrchardCore.ContentFields.Settings.ContentPickerFieldSettingsDriver"
 msgid "Title Pattern does not contain a valid Liquid expression. Details: {0}"
-msgstr ""
+msgstr "Το Μοτίβο τίτλου δεν περιέχει έγκυρη Liquid έκφραση. Λεπτομέρειες: {0}"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(ContentPickerFieldSettingsViewModel.Stereotypes), S["Please provide a Stereotype."]);
 #: OrchardCore.ContentFields\Settings\ContentPickerFieldSettingsDriver.cs:91
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Εναλλαγή"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Δεν υπάρχουν στοιχεία περιεχομένου."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Τυπικό"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Δεν έχει δημοσιευθεί"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Επιλογή"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Δε βρέθηκε κάποιο αποτέλεσμα"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Εάν πρόκειται να επιτραπεί η επιλογή πολλαπλών στοιχείων."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Εμφάνιση όλων των τύπων περιεχομένου"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "Όλοι οι τύποι περιεχομένου αυτών των στερεοτύπων"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Οι τύποι περιεχομένου που εμφανίζονται. Επιλέξτε τουλάχιστον ένα."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,17 +548,17 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
-msgstr ""
+msgstr "Μοτίβο τίτλου"
 
 #. <span class="hint">@T["The pattern used to render the title in content picker. With Liquid support."]</span>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:80
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The pattern used to render the title in content picker. With Liquid support."
-msgstr ""
+msgstr "Το μοτίβο που χρησιμοποιείται για την απόδοση του τίτλου στο εργαλείο επιλογής περιεχομένου. Με υποστήριξη Liquid."
 
 #. <option value="Localized" selected="@(currentEditor == "Localized")">@T["Localized"]</option>
 #: OrchardCore.ContentFields\Views\DateField-Localized.Option.cshtml:4
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Μεταφρασμένο"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Επεξεργαστής Κειμένου Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Εισαγάγετε τις επιλογές επεξεργαστή κειμένου, η γλώσσα ορίζεται πάντα σε `html` όταν αποθηκεύεται."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Τεκμηρίωση για επιλογές"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Εάν η διεύθυνση url χρησιμοποιείται όταν επιλέγεται από την επιλογή Εισαγωγή Πολυμέσων (Από προεπιλογή, έχει εισαχθεί ο Σύντομος κώδικας)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Τεκμηρίωση για επιλογές"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Κείμενο συνδέσμου"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Εαν απαιτείται η διεύθυνση url."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Χρησιμοποιήστε τη διεύθυνση url του συνδέσμου"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για τη διεύθυνση url στον επεξεργαστή κειμένου."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για το σύνδεσμο στον επεξεργαστή κειμένου."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Μια υπόδειξη (placeholder) που εμφανίζεται όταν η εισαγωγή του url είναι κενή."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Μια υπόδειξη (placeholder) που εμφανίζεται όταν η εισαγωγή του κειμένου είναι κενή."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Ένα έγκυρο url που προτείνεται κατά τη δημιουργία ενός νέου περιεχομένου."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Δεν υπάρχουν στοιχεία περιεχομένου."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Τυπικό"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Δεν έχει δημοσιευθεί"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Επιλογή"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Δε βρέθηκαν αποτελέσματα"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Εάν πρόκειται να επιτραπεί η επιλογή πολλαπλών στοιχείων."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Οι τύποι περιεχομένου που εμφανίζονται. Επιλέξτε τουλάχιστον ένα."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Λίστα Πλαισίου Ελέγχου"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Επιλογή"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Δεν βρέθηκαν τιμές"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Επεξεργασία δεδομένων"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Μια αναπαράσταση JSON των επιτρεπόμενων τιμών, π.χ. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Εύρος"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Κανένα"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Στροβιλιστής"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Μια υπόδειξη που θα εμφανιστεί όταν η εισαγωγή είναι κενή. (προαιρετικό)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Ο αριθμός των ψηφίων μετά την υποδιαστολή."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Η ελάχιστη επιτρεπόμενη τιμή. (προαιρετικό)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Η μέγιστη επιτρεπόμενη τιμή. (προαιρετικό)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Εισαγάγετε τις επιλογές επεξεργαστή κειμένου."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Τεκμηρίωση για επιλογές"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Επεξεργασία δεδομένων"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Μια αναπαράσταση JSON των επιτρεπόμενων τιμών, π.χ. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,25 +1523,25 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
-msgstr ""
+msgstr "Προεπιλεγμένη τιμή"
 
 #. <span class="hint">@T["The default value. (optional)"]</span>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
-msgstr ""
+msgstr "Η προεπιλεγμένη τιμή. (προαιρετικό)"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Για τα δευτερόλεπτα χρησιμοποιήστε διαιρέτη του 60 π.χ. '15', για ms ένα δεκαδικό ίσο με διαιρέτη του 1000 διαιρούμενο με το 1000 π.χ. '0,250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Δεν υπάρχουν χρήστες."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Τυπικό"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Μη ενεργοποιημένο"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Επιλογή"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Δε βρέθηκε κάποιο αποτέλεσμα"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Εάν θα επιτραπεί η επιλογή πολλών στοιχείων."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Εάν θα επιτρέπεται στο εργαλείο επιλογής να εμφανίζει χρήστες από όλους τους ρόλους."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Απαιτείται"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Υπόδειξη"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Πλάτος"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Το πλάτος του Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Ύψος"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Το ύψος του Videobox"
diff --git a/Localization/el/OrchardCore.ContentLocalization.po b/Localization/el/OrchardCore.ContentLocalization.po
index ba014e1f7312b..5b6c3b000b622 100644
--- a/Localization/el/OrchardCore.ContentLocalization.po
+++ b/Localization/el/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Δεν ήταν δυνατή η δημιουργία τοπικοποίησης έκδοσης του στοιχείου περιεχομένου."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
@@ -152,7 +152,7 @@ msgstr "Ορίζει το cookie τοπικοποίησης με βάση τον
 #: OrchardCore.ContentLocalization\Views\Items\ContentsAdminFilters-Culture.Thumbnail.cshtml:6
 msgctxt "OrchardCore.ContentLocalization.Views.Items.ContentsAdminFilters-Culture.Thumbnail"
 msgid "Culture"
-msgstr ""
+msgstr "Πολιτισμός"
 
 #. <p>@T["Filters on a content items localization culture."]</p>
 #: OrchardCore.ContentLocalization\Views\Items\ContentsAdminFilters-Culture.Thumbnail.cshtml:8
diff --git a/Localization/el/OrchardCore.ContentPreview.po b/Localization/el/OrchardCore.ContentPreview.po
index f2e5ca71020df..c27296a7692f9 100644
--- a/Localization/el/OrchardCore.ContentPreview.po
+++ b/Localization/el/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Το μοτίβο δεν περιέχει μια έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Αποσυνδεδεμένη Προεπισκόπηση"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Προεπισκόπηση Σφάλματος"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/el/OrchardCore.ContentTypes.po b/Localization/el/OrchardCore.ContentTypes.po
index fe442b64d88b9..feea5658aa0fa 100644
--- a/Localization/el/OrchardCore.ContentTypes.po
+++ b/Localization/el/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Μέρη Περιεχομένου"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Το Εμφανιζόμενο Όνομα δεν μπορεί να είναι κενό."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Ένας τύπος με το ίδιο Εμφανιζόμενο Όνομα υπάρχει ήδη."
@@ -66,10 +66,10 @@ msgstr "Ένας τύπος με το ίδιο Εμφανιζόμενο Όνομ
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Η τεχνική ονομασία δεν μπορεί να είναι κενή."
@@ -78,10 +78,10 @@ msgstr "Η τεχνική ονομασία δεν μπορεί να είναι 
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Η Τεχνική Ονομασία πρέπει να ξεκινά με γράμμα."
@@ -90,10 +90,10 @@ msgstr "Η Τεχνική Ονομασία πρέπει να ξεκινά με 
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Το Τεχνικό Όνομα περιέχει μη έγκυρους χαρακτήρες."
@@ -101,133 +101,133 @@ msgstr "Το Τεχνικό Όνομα περιέχει μη έγκυρους χ
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "Το Τεχνικό Όνομα προορίζεται για εσωτερική χρήση."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Ένας τύπος με την ίδια Τεχνική Ονομασία υπάρχει ήδη."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Ο τύπος περιεχομένου \"{0}\" έχει δημιουργηθεί."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Οι ρυθμίσεις του \"{0}\" έχουν αποθηκευτεί."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" έχουν καταργηθεί."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Το τμήμα \"{0}\" έχει προστεθεί."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Ένα τμήμα με το ίδιο Όνομα Εμφάνισης υπάρχει ήδη."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Ένα τμήμα με την ίδια Τεχνική Ονομασία υπάρχει ήδη."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Το τμήμα \"{0}\" έχει καταργηθεί."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Το τμήμα περιεχομένου δεν ήταν δυνατό να δημιουργηθεί."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Το τμήμα περιεχομένου \"{0}\" έχει δημιουργηθεί."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Οι ρυθμίσεις του \"{0}\" έχουν αποθηκευτεί."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "Δεν υπάρχουν πεδία."
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Υπάρχει ήδη ένα πεδίο με το ίδιο Εμφανιζόμενο Όνομα."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Ένα πεδίο με την ίδια Τεχνική Ονομασία υπάρχει ήδη."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Το πεδίο \"{0}\" έχει προστεθεί."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Το εμφανιζόμενο όνομα άλλαξε σε {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Οι ρυθμίσεις toy πεδίου \"{0}\" έχουν αποθηκευτεί."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Το πεδίο \"{0}\" έχει καταργηθεί."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Οι ρυθμίσεις του τμήματος \"{0}\" έχουν αποθηκευτεί."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Το όνομα Τύπου Περιεχομένου δεν μπορεί να είναι κενό."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Δεν είναι δυνατή η προσθήκη τμήματος που ονομάζεται '{0}'. Υπάρχει ήδη."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Προσθήκη Νέου Πεδίου στο \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Το όνομα του πεδίου όπως θα εμφανίζεται στις οθόνες."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Προσθήκη Ονομαστικού Τμήματος στο \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Όνομα του τμήματος που μπορεί να επαναχρησιμοποιηθεί καθώς θα εμφανίζεται στις οθόνες."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Τεχνική ονομασία του τμήματος επαναχρησιμοποίησης."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Εξάγει καθορισμένο τύπο περιεχομένου και ορισμούς τμημάτων για ενημέρωση."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Τεχνική ονομασία του τμήματος."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Το όνομα του τμήματος όπως θα εμφανίζεται σε οθόνες. Αφήστε κενό για να χρησιμοποιήθουν οι προεπιλογές."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Επιλέξτε για να επιτραπεί η προσάρτηση αυτού του τμήματος πολλές φορές."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Τεχνική ονομασία του τύπου."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Ονομασία του τύπου όπως θα εμφανίζεται στις οθόνες."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Νέος Τύπος Περιεχομένου"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Το Όνομα του τύπου όπως θα εμφανίζεται στις οθόνες."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Νέο Τμήμα Περιεχομένου"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Δημιουργία"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Μια λίστα διαχωρισμένων με κόμμα ορισμών τύπου περιεχομένου για διαγραφή"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Εξάγει καθορισμένο τύπο περιεχομένου και ορισμούς τμημάτων για διαγραφή."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Επεξεργασία Τύπου Περιεχομένου - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Πεδία"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Λειτουργία προβολής"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "Επεξεργαστή Κειμένου"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Προσθήκη Πεδίου"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Τμήματα"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Περιέχει τα πεδία για τον τρέχοντα τύπο"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Προσθήκη Τμημάτων"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Προσθήκη Μέρους που έχει Ονομαστεί"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" ρυθμίσεις για \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Το όνομα του πεδίου όπως θα εμφανίζεται στις οθόνες."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Τεχνική ονομασία του πεδίου."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Ποιος τύπος επεξεργαστή κειμένου πρέπει να χρησιμοποιηθεί;"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Ποιος τύπος λειτουργίας εμφάνισης πρέπει να χρησιμοποιηθεί;"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Άκυρο"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Ορισμένες ρυθμίσεις κοινής χρήσης για όλους τους τύπους μπορούν επίσης να καθοριστούν στο επίπεδο <a href=\"{0}\">Ορισμός μέρους </a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Το όνομα του τμήματος όπως θα εμφανίζεται στις οθόνες."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Η περιγραφή του τμήματος όπως θα εμφανίζεται στις οθόνες."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Τι είδους επεξεργαστή κειμένου πρέπει να χρησιμοποιηθεί;"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Τι είδους λειτουργία εμφάνισης πρέπει να χρησιμοποιείται;"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Άκυρο"
diff --git a/Localization/el/OrchardCore.Contents.po b/Localization/el/OrchardCore.Contents.po
index f403faee0d4df..49ed8ce2238bf 100644
--- a/Localization/el/OrchardCore.Contents.po
+++ b/Localization/el/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Η δημοσίευση του {0} ανακλήθηκε."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Όλοι οι τύποι περιεχομένου"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Παρουσιάστηκε ένα ή περισσότερα σφάλματα επικύρωσης."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Εξάγει τις ρυθμίσεις της διαδρομής ελέγχου περιεχομένου."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Περιεχόμενο"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Τέλος"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Διαδρομή Ελέγχου"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Εάν το σχόλιο της διαδρομής ελέγχου εμφανίζεται κατά την επεξεργασία."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Η ημερομηνία δημιουργίας ή της δημοσίευσης του περιεχομένου."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "Επιλέξτε για να μπορείτε να επεξεργαστείτε τον ιδιοκτήτη του στοιχείου περιεχομένου. Θα απαιτείται επίσης η άδεια <code>EditContentOwner</code>."
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "και συνεχίσε"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Δράσεις"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Οποιονδήποτε τύπος περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Οποιονδήποτε τύπος περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Περιεχόμενο"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Οποιονδήποτε τύπος περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Το πρόχειρο περιεχομένου είναι αποθηκευμένο."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Αντικείμενα Περιεχομένου"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Όλοι οι τύποι περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1295,7 +1295,7 @@ msgstr "Είστε βέβαιοι(ες) ότι θέλετε να {0} αυτά τ
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-ContentType.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-ContentType.Thumbnail"
 msgid "Content Type"
-msgstr ""
+msgstr "Τύπος Περιεχομένου"
 
 #. <p>@T["Filters on a specified content type."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-ContentType.Thumbnail.cshtml:8
@@ -1307,7 +1307,7 @@ msgstr "Φίλτρα σε έναν καθορισμένο τύπο περιεχ
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-DisplayText.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-DisplayText.Thumbnail"
 msgid "Display Text"
-msgstr ""
+msgstr "Εμφάνιση Κειμένου"
 
 #. <p>@T["Filters on the Display Text of a content item."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-DisplayText.Thumbnail.cshtml:8
@@ -1319,7 +1319,7 @@ msgstr "Φίλτρα στο εμφανιζόμενο κείμενο ενός σ
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Sort.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Sort.Thumbnail"
 msgid "Sort"
-msgstr ""
+msgstr "Ταξινόμηση"
 
 #. <p>@T["Orders by a content item value."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Sort.Thumbnail.cshtml:8
@@ -1331,7 +1331,7 @@ msgstr "Ταξινομημένα ανά τιμή στοιχείου περιεχ
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Status.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Status.Thumbnail"
 msgid "Status"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. <p>@T["Filters on a content item status."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Status.Thumbnail.cshtml:8
@@ -1343,13 +1343,13 @@ msgstr "Φίλτρα για την κατάσταση ενός στοιχείο
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Stereotype.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Stereotype.Thumbnail"
 msgid "Content Type Stereotype"
-msgstr ""
+msgstr "Τύπος Περιεχομένου Στερεότυπου"
 
 #. <p>@T["Filters on a specified content type stereotype."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Stereotype.Thumbnail.cshtml:8
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Stereotype.Thumbnail"
 msgid "Filters on a specified content type stereotype."
-msgstr ""
+msgstr "Φίλτρα σε ένα συγκεκριμένο στερεότυπο τύπου περιεχομένου."
 
 #. @T["No results found."]
 #: OrchardCore.Contents\Views\ContentsAdminList.cshtml:46
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Εμφάνιση όλων των τύπων περιεχομένου"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Διαλέξτε εικονίδιο"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Εμφάνιση όλων των Τύπων Περιεχομένου"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Περιόρισε τον αριθμό των στοιχείων περιεχομένου που θα παρέχονται από αυτήν την πηγή. Σημείωση: Μόνο ένας τύπος περιεχομένου είναι επιλέξιμος όταν έχει επιλεγεί αυτή η επιλογή."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Η προεπιλεγμένη συχνότητα με την οποία είναι πιθανό να αλλάξουν αυτοί οι τύποι περιεχομένου."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Κάθε τύπος περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Κάθε τύπος περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Κάθε τύπος περιεχομένου"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Δημιουργία Περιεχομένου"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Επίλεξε, αν θέλεις να δημοσιεύεται το περιεχόμενο κατά τη δημιουργία του. Από-επίλεξε για να δημιουργήσεις μια έκδοση προσχέδιου."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Διαγράψτε το περιεχόμενο χρησιμοποιώντας την έκφραση: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Προβολή πρόχειρου ως JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Λήψη Προσχεδίου ως JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Δείτε τη δημοσιευμένη έκδοση σε μορφή JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Η λήψη Δημοσιεύτηκε ως JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Προβολή ως JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Δεν βρέθηκε περιεχόμενο εξαγωγής σε σχέδια στόχων ανάπτυξης. Δημιουργήστε ένα σχέδιο ανάπτυξης και προσθέστε σε αυτό ένα βήμα εξαγωγής περιεχομένου στο στόχο ανάπτυξης."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Περιεχόμενο"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Νέο"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Δημοσιεύστε το περιεχόμενο χρησιμοποιώντας την έκφραση: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Ανάκτηση περιεχομένου με χρήση έκφρασης: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Κατάργηση δημοσίευσης περιεχομένου χρησιμοποιώντας την έκφραση: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Ενημερώστε το περιεχόμενο χρησιμοποιώντας έκφραση: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Εισαγάγετε μια έκφραση JavaScript που αξιολογείται στο αναγνωριστικό του στοιχείου περιεχομένου (ContentItemId) που πρόκειται να ενημερωθεί. Για παράδειγμα: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/el/OrchardCore.Cors.po b/Localization/el/OrchardCore.Cors.po
index fb668f416a496..a9afc2827ca80 100644
--- a/Localization/el/OrchardCore.Cors.po
+++ b/Localization/el/OrchardCore.Cors.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:49\n"
+"PO-Revision-Date: 2023-10-25 13:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Cors\AdminMenu.cs:25
@@ -284,5 +284,5 @@ msgstr "Προσθήκη"
 #: OrchardCore.Cors\Views\NavigationItemText-cors.Id.cshtml:1
 msgctxt "OrchardCore.Cors.Views.NavigationItemText-cors.Id"
 msgid "CORS"
-msgstr ""
+msgstr "CORS"
 
diff --git a/Localization/el/OrchardCore.CustomSettings.po b/Localization/el/OrchardCore.CustomSettings.po
index 04d68521fa471..da038ef5e794b 100644
--- a/Localization/el/OrchardCore.CustomSettings.po
+++ b/Localization/el/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Προσαρμοσμένες Ρυθμίσεις"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/el/OrchardCore.Data.YesSql.po b/Localization/el/OrchardCore.Data.YesSql.po
index 5b28250881bac..8954859045b20 100644
--- a/Localization/el/OrchardCore.Data.YesSql.po
+++ b/Localization/el/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "Αποτυχία κατάργησης των πινάκων."
diff --git a/Localization/el/OrchardCore.Demo.po b/Localization/el/OrchardCore.Demo.po
index f29b2ed13200d..d054376a6167f 100644
--- a/Localization/el/OrchardCore.Demo.po
+++ b/Localization/el/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Μικρό όνομα"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Επώνυμο"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/el/OrchardCore.Deployment.Remote.po b/Localization/el/OrchardCore.Deployment.Remote.po
index 4750d6cac3d15..bc394cfae9ef4 100644
--- a/Localization/el/OrchardCore.Deployment.Remote.po
+++ b/Localization/el/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Στέλνει το σχέδιο ανάπτυξης σε ένα απομακρυσμένο στιγμιότυπο."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "'Ονομα Πελάτη"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Δημιουργία Απομακρυσμένου Στιγμιότυπου"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "'Ονομα Πελάτη"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Επεξεργασία Απομακρυσμένου Πελάτη"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "'Ονομα Πελάτη"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Επεξεργασία Απομακρυσμένου Στιγμιότυπου"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "'Ονομα Πελάτη"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/el/OrchardCore.Deployment.po b/Localization/el/OrchardCore.Deployment.po
index f1797787b44dd..1c173cb24ad98 100644
--- a/Localization/el/OrchardCore.Deployment.po
+++ b/Localization/el/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Εισαγωγή JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Τα σχέδια ανάπτυξης διαγράφηκαν με επιτυχία."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Το όνομα είναι υποχρεωτικό."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Υπάρχει ήδη ένα σχέδιο ανάπτυξης με το ίδιο όνομα."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Το σχέδιο ανάπτυξης ενημερώθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Το σχέδιο ανάπτυξης διαγράφηκε με επιτυχία."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Δημιουργία Σχεδίου Ανάπτυξης"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Το προσαρμοσμένο αρχείο για προσθήκη ως μέρος του σχεδίου."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Το όνομα αρχείου όπως θα προστεθεί στην αρχειοθέτηση."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Σχέδια Aνάπτυξης"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Επεξεργασία Σχεδίου Ανάπτυξης"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "Συνταγή JSON"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Το αρχείο συνταγών για προσθήκη ως μέρος του σχεδίου."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Το όνομα της συνταγής."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Το εμφανιζόμενο όνομα της συνταγής."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Η περιγραφή της συνταγής."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Ο δημιουργός της συνταγής."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Η συνταγή της Ιστοσελίδας."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Η έκδοση της συνταγής."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Οι κατηγορίες της συνταγής (τιμές διαχωρισμένες με κόμμα)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/el/OrchardCore.Diagnostics.po b/Localization/el/OrchardCore.Diagnostics.po
index 70c487ceb131c..5a0d4af92a788 100644
--- a/Localization/el/OrchardCore.Diagnostics.po
+++ b/Localization/el/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Το πρόγραμμα περιήγησής σας, έστειλε ένα αίτημα που δεν ήταν κατανοητό από αυτόν τον διακομιστή."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Παρουσιάστηκε σφάλμα κατά την εκτέλεση αυτού του αιτήματος."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Δεν έχετε πρόσβαση σε αυτόν τον πόρο."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Η σελίδα δεν βρέθηκε."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Δεν έχετε εξουσιοδότηση για να δείτε αυτό το περιεχόμενο."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/el/OrchardCore.Email.Abstractions.po b/Localization/el/OrchardCore.Email.Abstractions.po
index ca85352598aff..a6c1d7d0a4dfa 100644
--- a/Localization/el/OrchardCore.Email.Abstractions.po
+++ b/Localization/el/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Το πεδίο {0} είναι υποχρεωτικό."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Η μέθοδος παράδοσης '{0}' δεν υποστηρίζεται."
diff --git a/Localization/el/OrchardCore.Email.po b/Localization/el/OrchardCore.Email.po
index b08a5538124b4..d9004e0c51c6f 100644
--- a/Localization/el/OrchardCore.Email.po
+++ b/Localization/el/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Μη έγκυρο email."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Εργασία Email"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Μηνύματα"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Απέτυχε"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Αποστολή Email"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "Η διεύθυνση email του συγγραφέα που καθορίζει από ποιον είναι το email. Άφησε κενό για να χρησιμοποιήσεις τη διαμορφωμένη διεύθυνση email. Με υποστήριξη Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Η διεύθυνση email του αποστολέα. Απαιτείται αν είναι διαφορική από τη διεύθυνση email \"Από\". Με υποστήριξη Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Το διεύθυνση email \"απάντηση σε\". Εάν θέλετε οι απαντήσεις μέσω email να αποστέλλονται σε διαφορετική διεύθυνση από τη διεύθυνση \"Από\", τότε πρέπει να συμπληρωθεί. Με υποστήριξη Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Η λίστα διευθύνσεων ηλεκτρονικού ταχυδρομείου προορισμού που είναι διαχωρισμένη με κόμματα. Με υποστήριξη Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "Η λίστα διευθύνσεων ηλεκτρονικού ταχυδρομείου διαχωρισμένη με κόμματα. Με υποστήριξη Liquid."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "Η λίστα διαχωρισμένων με κόμματα διευθύνσεων email κρυφών αντιγράφων. Με υποστήριξη Liquid."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Εάν επιλεγεί, υποδεικνύει ότι το σώμα του μηνύματος email θα σταλεί ως HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Προς"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Ο αποστολέας είναι προαιρετικός, είναι χρήσιμο όταν ο συντάκτης email είναι διαφορετικός από τον αποστολέα email."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Κρυφ. κοιν."
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Κοινοποίηση"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Απάντηση Σε"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Θέμα"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Σώμα"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ο τρέχων ενοικιαστής θα φορτωθεί ξανά όταν αποθηκευτούν οι ρυθμίσεις."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Η προεπιλεγμένη διεύθυνση email για χρήση ως αποστολέας, εκτός εάν έχει οριστεί ο αποστολέας email."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Επιλογές παροχής δικτύου"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Ο τομέας διακομιστή SMTP, π.χ. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Η θύρα διακομιστή SMTP, συνήθως 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Ο διακομιστής μεσολάβησης είναι προαιρετικός."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "Η θύρα διακομιστή μεσολάβησης είναι προαιρετική."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -378,7 +378,7 @@ msgstr "Συνδεθείτε στο διακομιστή χρησιμοποιώ
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:87
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. @T["SSL/TLS"] - @T["Connect to server using SSL/TSL secure connection"]
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:87
@@ -390,7 +390,7 @@ msgstr "Συνδεθείτε στο διακομιστή χρησιμοποιώ
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:90
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "STARTTLS"
-msgstr ""
+msgstr "STARTTLS"
 
 #. @T["STARTTLS"] - @T["Connect to server using insecure connection and upgrade to secure using SSL/TLS"]
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:90
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Όταν είναι επιλεγμένη αυτή η επιλογή, η ομάδα εφαρμογών ή η ταυτότητα διεργασίας κεντρικού υπολογιστή χρησιμοποιείται για έλεγχο ταυτότητας με τον διακομιστή αλληλογραφίας."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Το όνομα χρήστη για έλεγχο ταυτότητας."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Επιλογές Καθορισμένου καταλόγου συλλογής για παράδοση"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Π.χ. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> για να τοποθετήσετε μηνύματα ηλεκτρονικού ταχυδρομείου σε έναν κατάλογο <i>PickedUpEmail</i> στη μονάδα C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/el/OrchardCore.Facebook.po b/Localization/el/OrchardCore.Facebook.po
index 8361e93ca3315..e81752dffc2c1 100644
--- a/Localization/el/OrchardCore.Facebook.po
+++ b/Localization/el/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -30,7 +30,7 @@ msgstr "Ρυθμίσεις"
 #: OrchardCore.Facebook\AdminMenu.cs:28
 msgctxt "OrchardCore.Facebook.AdminMenu"
 msgid "Meta App"
-msgstr ""
+msgstr "Meta App"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Facebook\AdminMenu.cs:60
@@ -62,7 +62,7 @@ msgstr ""
 #: OrchardCore.Facebook\AdminMenu.cs:95
 msgctxt "OrchardCore.Facebook.AdminMenuPixel"
 msgid "Settings"
-msgstr ""
+msgstr "Ρυθμίσεις"
 
 #. .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel
 #. .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Το Σώμα FaceBook δεν περιέχει έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Το Σώμα δεν περιέχει μια έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Ρυθμίσεις σύνδεσης"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Η διαδρομή αιτήματος μέσα στη βάσική διαδρομή της εφαρμογής όπου ο user-agent θα επιστραφεί. H διαδικασία middleware θα επεξεργαστεί αυτό το αίτημα όταν φθάνει."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Το πρότυπο του plugin, σε Liquid μορφή."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Έκδοση SDK Javascript"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Αρχικοποίηση σε κάθε σελίδα"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/el/OrchardCore.Features.po b/Localization/el/OrchardCore.Features.po
index b7ec1ddea5822..932fe767de04b 100644
--- a/Localization/el/OrchardCore.Features.po
+++ b/Localization/el/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Χαρακτηριστικά"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Παρακαλώ επίλεξε ένα ή περισσότερα Χαρακτηριστικά."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "Αυτή η δυνατότητα είναι πάντα ενεργοποιημένη και δεν μπορεί να απενεργοποιηθεί."
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} ήταν {1}."
@@ -125,9 +125,9 @@ msgstr "Μαζικές ενέργειες"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Απενεργοποίηση"
@@ -136,8 +136,8 @@ msgstr "Απενεργοποίηση"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Εργοποίηση"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Αταξινόμητες"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "Αυτή η δυνατότητα ενεργοποιείται αυτόματα με βάση τις εξαρτήσεις της και δεν μπορεί να απενεργοποιηθεί με μη αυτόματο τρόπο."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "Αυτή η δυνατότητα απενεργοποιείται αυτόματα με βάση την εξάρτηση της και δεν μπορεί να ενεργοποιηθεί με μη αυτόματο τρόπο."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "Αυτή η δυνατότητα είναι πάντα ενεργοποιημένη και δεν μπορεί να απενεργοποιηθεί με μη αυτόματο τρόπο."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Η απενεργοποίηση της λειτουργίας {0} θα απενεργοποιήσει επίσης τις ακόλουθες εξαρτημένες λειτουργίες: {1} Συνέχεια;"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Απενεργοποίηση Χαρακτηριστικών"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Ναι"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "'Οχι"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Δεν υπάρχει τίποτα εδώ!</strong> Η αναζήτηση δεν επέστρεψε κανένα αποτέλεσμα."
diff --git a/Localization/el/OrchardCore.Flows.po b/Localization/el/OrchardCore.Flows.po
index 586e48342d210..aa0e3c1f3d1ca 100644
--- a/Localization/el/OrchardCore.Flows.po
+++ b/Localization/el/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr "Το στοιχείο περιεχομένου Widget με αναγνωριστικό {0} δεν αντιστοιχεί με τον τύπου περιεχομένου {1}."
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Προσθήκη αντικειμένου"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Οι τύποι περιεχομένου που μπορεί να περιέχει αυτός ο σάκος, π.χ. Σύρετε για μια παρουσίαση διαφανειών."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr "Τα στερεότυπα των τύπων περιεχομένου που μπορεί να περιέχει αυτό το καλάθι. Μπορείτε να ορίσετε πολλαπλά στερεότυπα χρησιμοποιώντας το κόμμα (,) ως διαχωριστικό"
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -156,7 +156,7 @@ msgstr "Είστε βέβαιοι ότι θέλετε να καταργήσετ
 #: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "{0} {1}"
-msgstr ""
+msgstr "{0} {1}"
 
 #. <button type="button" class="toggleAll btn btn-secondary btn-sm" onclick="toggleWidgets();" title="@T["Toggle all widgets"]">
 #: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:33
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Εισαγωγή Widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτό το στοιχείο;"
@@ -210,37 +210,37 @@ msgstr "Στοίχιση"
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "25%"
-msgstr ""
+msgstr "25%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_33" type="radio" autocomplete="off" value="33">@T["33%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:33
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "33%"
-msgstr ""
+msgstr "33%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_50" type="radio" autocomplete="off" value="50">@T["50%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:36
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_66" type="radio" autocomplete="off" value="66">@T["66%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:39
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "66%"
-msgstr ""
+msgstr "66%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_75" type="radio" autocomplete="off" value="75">@T["75%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:42
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "75%"
-msgstr ""
+msgstr "75%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_100" type="radio" autocomplete="off" value="100">@T["100%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:45
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
 #. <button type="button" title="@T["Add Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Flows\Views\FlowPart.Edit.cshtml:66
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "Δε βρέθηκαν widgets."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/el/OrchardCore.Forms.po b/Localization/el/OrchardCore.Forms.po
index 4c88f4998011f..4ab65e9760477 100644
--- a/Localization/el/OrchardCore.Forms.po
+++ b/Localization/el/OrchardCore.Forms.po
@@ -10,13 +10,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
 msgctxt "OrchardCore.Forms.Drivers.FormInputElementPartDisplayDriver"
 msgid "A value is required for Name."
-msgstr ""
+msgstr "Απαιτείται μια τιμή για το Όνομα."
 
 #. updater.ModelState.AddModelError(Prefix + '.' + nameof(SelectPartEditViewModel.Options), S["The options are written in an incorrect format."]);
 #: OrchardCore.Forms\Drivers\SelectPartDisplayDriver.cs:60
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Οι επιλογές είναι γραμμένες σε λανθασμένη μορφή."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Προσθέστε εργασία Σφάλματος Επικύρωσης Μοντέλου"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Επικύρωση"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Εργασία Σύνδεσης Κατάστασης Μοντέλου"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Επικύρωση"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Επικύρωση της εργασίας Antiforgery Συμβόλου (Token)"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Επικύρωση"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Έγκυρο"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Μη έγκυρο"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Επικυρώστε την Εργασία του Πεδίου Φόρμας"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Επικύρωση"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Έγκυρο"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Μη έγκυρο"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Εργασία Επικυρώση της Φόρμας"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Επικύρωση"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Έγκυρο"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Μη έγκυρο"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Το όνομα του πεδίου φόρμας που έχει μη έγκυρη τιμή."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Δεσμεύει τα υποβληθέντα πεδία φόρμας στην κατάσταση του μοντέλου."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Το κείμενο που εμφανίζεται στο κουμπί."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Ο τύπος κουμπιού."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr "Ο τύπος ετικέτας που πρέπει να δημιουργηθεί για αυτό το πεδίο."
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr "Το κείμενο που θα εμφανιστεί στην ετικέτα."
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "Το ID για την αναπαραγωγή σε αυτό το στοιχείο φόρμας."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr "Ο τύπος επικύρωσης που πρέπει να δημιουργηθεί για αυτό το πεδίο."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Το όνομα αναπαραγωγής σε αυτό το στοιχείο φόρμας."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "Η διεύθυνση URL για την υποβολή της φόρμας."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Η μέθοδος HTTP που θα χρησιμοποιηθεί κατά την υποβολή της φόρμας."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Επιλέξτε για να δημιουργήσετε ένα Anti Forgery Σύμβολο (Token) κατά της πλαστογραφίας στη φόρμα."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Ο τύπος κουμπιού."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Το κείμενο που εμφανίζεται όταν το πεδίο δεν έχει τιμή."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Η προεπιλεγμένη τιμή για αυτό το πεδίο."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Επεξεργασία δεδομένων"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Μια αναπαράσταση JSON των επιτρεπόμενων τιμών, π.χ. {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr "Το στυλ επεξεργασίας που θα χρησιμοποιηθεί για αυτό το πεδίο."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Το κείμενο που εμφανίζεται όταν το πεδίο δεν έχει τιμή."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Επικύρωση <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Το όνομα του πεδίου φόρμας για επικύρωση."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Ελέγχει αν η υποβληθείσα φόρμα περιέχει τυχόν σφάλματα επικύρωσης."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/el/OrchardCore.GitHub.po b/Localization/el/OrchardCore.GitHub.po
index 9cf8541e7056c..4eec54d6bb74c 100644
--- a/Localization/el/OrchardCore.GitHub.po
+++ b/Localization/el/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Ρυθμίσεις ελέγχου ταυτότητας GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Το ID πελάτη ορίζεται στη γενική καρτέλα του <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,11 +110,11 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Το μυστικό για την εφαρμογή σας."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
-msgstr ""
+msgstr "CallbackPath"
 
 #. <span class="hint">@T["The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."]</span>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:39
@@ -138,5 +138,5 @@ msgstr "Αποθηκεύστε εξωτερικά σύμβολα (tokens) αυθ
 #: OrchardCore.GitHub\Views\NavigationItemText-github.Id.cshtml:1
 msgctxt "OrchardCore.GitHub.Views.NavigationItemText-github.Id"
 msgid "GitHub"
-msgstr ""
+msgstr "GitHub"
 
diff --git a/Localization/el/OrchardCore.Google.po b/Localization/el/OrchardCore.Google.po
index c9e6be42ec9af..01538cfaa4234 100644
--- a/Localization/el/OrchardCore.Google.po
+++ b/Localization/el/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Ρυθμίσεις Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Ρυθμίσεις Google Authentication"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Το id πελάτη που ορίζεται στην κονσόλα API Google για την εφαρμογή."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Το μυστικό πελάτη που ορίζεται στην κονσόλα API Google για την εφαρμογή."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr "Ρυθμίσεις Διαχειριστή ετικετών Google"
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
@@ -292,13 +292,13 @@ msgstr "Το αναγνωριστικό περιεχομένου ID που ορ
 #: OrchardCore.Google\Views\NavigationItemText-google.Id.cshtml:1
 msgctxt "OrchardCore.Google.Views.NavigationItemText-google.Id"
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. <span class="icon"><i class="fa-brands fa-google" aria-hidden="true"></i></span><span class="title">@T["Google Analytics"]</span>
 #: OrchardCore.Google\Views\NavigationItemText-googleAnalytics.Id.cshtml:1
 msgctxt "OrchardCore.Google.Views.NavigationItemText-googleAnalytics.Id"
 msgid "Google Analytics"
-msgstr ""
+msgstr "Google Analytics"
 
 #. <span class="icon"><i class="fa-brands fa-google" aria-hidden="true"></i></span><span class="title">@T["Google Tag Manager"]</span>
 #: OrchardCore.Google\Views\NavigationItemText-googleTagManager.Id.cshtml:1
diff --git a/Localization/el/OrchardCore.Html.po b/Localization/el/OrchardCore.Html.po
index d6866dd7a0a8f..ef3d07dfd36a8 100644
--- a/Localization/el/OrchardCore.Html.po
+++ b/Localization/el/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Επεξεργαστή Κειμένου Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Το σώμα του περιεχομένου."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Εισαγάγετε τις επιλογές επεξεργαστή κειμένου, η γλώσσα ορίζεται πάντα σε `html` όταν αποθηκεύεται."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Τεκμηρίωση για επιλογές"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Εάν η διεύθυνση url χρησιμοποιείται όταν επιλέγεται από την επιλογή Εισαγωγή Πολυμέσων (Από προεπιλογή, έχει εισαχθεί ο Σύντομος κώδικας)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Εισήγαγε τις επιλογές του επεξεργαστή κειμένου"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Τεκμηρίωση για επιλογές"
diff --git a/Localization/el/OrchardCore.Https.po b/Localization/el/OrchardCore.Https.po
index 21ca35b0f2103..42e21fb79fb5c 100644
--- a/Localization/el/OrchardCore.Https.po
+++ b/Localization/el/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Καθορίζει αν θα πρέπει να χρησιμοποιείται μόνιμη ανακατεύθυνση, 308 Μετακινήθηκε μόνιμα, αντί για προσωρινή ανακατεύθυνση, 307 Βρέθηκε, κατά την ανακατεύθυνση σε HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/el/OrchardCore.Infrastructure.Abstractions.po b/Localization/el/OrchardCore.Infrastructure.Abstractions.po
index 0f8dc3e86313c..d407882307098 100644
--- a/Localization/el/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/el/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "Ο διακόπτης \"{0}\" δεν βρέθηκε"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Υπάρχει μια ιδιότητα \"{0}\" αλλά δεν είναι διακοσμημένη με \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Σφάλμα μετατροπής της τιμής \"{0}\" σε \"{1}\" για το διακόπτη \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Τα ορίσματα εντολών \"{0}\" δεν ταιριάζουν με τον ορισμό της εντολής"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "Η μέθοδος \"{0}\" δεν υποστηρίζει το διακόπτη \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/el/OrchardCore.Layers.po b/Localization/el/OrchardCore.Layers.po
index 20467b2667a10..a4bb49c07a159 100644
--- a/Localization/el/OrchardCore.Layers.po
+++ b/Localization/el/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Δημιουργία Επιπέδου"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Περιγραφή"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Επεξεργασία επιπέδου - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "Σφάλμα ενημέρωσης σειράς κανόνα"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Αποθήκευση"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Επεξεργασία Widgets και Επιπέδων"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Το widget μεταφέρθηκε με επιτυχία. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Αναίρεση</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Ζώνες"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Παρακαλώ <a href=\"{0}\"> καθόρισε τις διαθέσιμες ζώνες </a> πριν προσθέσεις Widgets"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Προσθήκη Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "Δεν βρέθηκαν widgets."
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "Δεν βρέθηκαν επίπεδα."
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Επίπεδα"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Επιλέξτε ένα επίπεδο για να αποκαλύφθουν τα σχετιζόμενα widget."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Δείτε την τεκμηρίωση"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Επεξεργασία"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "<a href=\"{0}\"> Δημιούργησε ένα επίπεδο </a> πριν προσθέσεις Widgets"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Εάν είναι επιλεγμένο, ο τίτλος θα αναπαραχθεί με το widget."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Το επίπεδο στο οποίο πρέπει να συσχετιστεί το widget."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/el/OrchardCore.Liquid.po b/Localization/el/OrchardCore.Liquid.po
index ef0e7ab4be61d..5fd9bc0cb6a32 100644
--- a/Localization/el/OrchardCore.Liquid.po
+++ b/Localization/el/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Το σώμα του Liquid δεν περιέχει έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/el/OrchardCore.Lists.po b/Localization/el/OrchardCore.Lists.po
index 52a815d9dde75..ee575a6055cde 100644
--- a/Localization/el/OrchardCore.Lists.po
+++ b/Localization/el/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Αντιπροσωπεύει μια σύνδεση με το γονικό στοιχείο περιεχομένου και τη σειρά που αντιπροσωπεύει το στοιχείο περιεχομένου."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Αντιπροσωπεύει μια συλλογή στοιχείων περιεχομένου."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Το συγκεκριμένο Blog Post δεν υπάρχει πια. Δημιουργήστε ένα νέο Blog Post."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Δεν επιτρέπεται να διαγράψετε αυτό το περιεχόμενο"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Το όνομα χρήστη ή το e-mail ή ο κωδικός πρόσβασης που παρέχονται είναι λανθασμένα."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Η λίστα είναι κενή"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "Απενεργοποιήστε τη δημιουργία συνδέσμων τροφοδοσίας RSS."
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Η τρέχουσα ροή είναι διαθέσιμη στη διεύθυνση <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "Νέο"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Επιλέξτε αυτήν την επιλογή για να ενεργοποιήσετε τη μη αυτόματη ταξινόμηση αντικειμένων."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Λίστες"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Προσθήκη στοιχείου μενού γονέα"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/el/OrchardCore.Localization.po b/Localization/el/OrchardCore.Localization.po
index 5cec0bb4b8c89..c4a5462d5f62f 100644
--- a/Localization/el/OrchardCore.Localization.po
+++ b/Localization/el/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Πολιτισμοί"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Ο πολιτισμός πρέπει να συμπληρωθεί"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Ο ιστότοπος έχει επανεκκινήσει για να ισχύσουν οι ρυθμίσεις."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Οι ενεργοί πολιτισμοί που διαμορφώνονται για τον ιστότοπο."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Ρυθμίσεις πολιτισμού"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Εξάγει τις ρυθμίσεις πολιτισμού."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Προσθήκη πολιτισμού"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/el/OrchardCore.Markdown.po b/Localization/el/OrchardCore.Markdown.po
index 1337f9ec8ce6c..89de792f589d8 100644
--- a/Localization/el/OrchardCore.Markdown.po
+++ b/Localization/el/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "Το {0} δεν περιέχει έγκυρη Liquid έκφραση. Λεπτομέρειες: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Επεξεργαστή Κειμένου Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Το σώμα του στοιχείου περιεχομένου, σε μορφή Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Επεξεργαστή Κειμένου Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Καθιερωμένο"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/el/OrchardCore.Media.po b/Localization/el/OrchardCore.Media.po
index cf91ccf267522..91f4ef99c5f9e 100644
--- a/Localization/el/OrchardCore.Media.po
+++ b/Localization/el/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Δεν είναι δυνατή η μετακίνηση του πολυμέσου επειδή ένα αρχείο υπάρχει ήδη με το ίδιο όνομα"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Ένα προφίλ με το ίδιο όνομα υπάρχει ήδη."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Το προφίλ πολυμέσων διαγράφηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Τα προφίλ πολυμέσων καταργήθηκαν με επιτυχία."
@@ -181,95 +181,95 @@ msgstr "Τα προφίλ πολυμέσων καταργήθηκαν με επ
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Προεπιλογή"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Προσαρμογή Μεγέθους"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Προεπιλογή (Μέγ.)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Μέγιστο"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Περικοπή"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Ελάχιστο"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Τέντωμα"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,11 +280,11 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Υπήρξε σφάλμα κατά την επεξεργασία των αρχείων."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
-msgstr ""
+msgstr "Δεν επιτρέπεται η επέκταση πολυμέσων. Επιτρέπονται μόνο μέσα με επεκτάσεις \"{0}\"."
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["{0}: A media is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:140
@@ -316,11 +316,11 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Είτε να πάρετε τους πόρους από τον ακριβώς από πάνω κατάλογο ή από όλους τους υπο-καταλόγους."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
-msgstr ""
+msgstr "Επιλέξτε τουλάχιστον μία επέκταση."
 
 #. <h5>@T["All Media Profiles"]</h5>
 #: OrchardCore.Media\Views\Items\AllMediaProfilesDeploymentStep.Edit.cshtml:3
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Δημιουργία προφίλ πολυμέσων"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Το όνομα του προφίλ πολυμέσων."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Η υπόδειξη για το προφίλ πολυμέσων."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Επιλέξτε το πλάτος για την επεξεργασμένη εικόνα. Μια προεπιλεγμένη τιμή σημαίνει ότι μια εντολή πλάτους δεν θα εφαρμοστεί."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Επιλέξτε το ύψος για την επεξεργασμένη εικόνα. Μια προεπιλεγμένη τιμή σημαίνει ότι δεν θα εφαρμοστεί η εντολή ύψους."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Επιλέξτε τη λειτουργία αλλαγής μεγέθους για την επεξεργασμένη εικόνα."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Επιλέξτε το χρώμα φόντου για την επεξεργασμένη εικόνα. Μια κενή τιμή σημαίνει ότι μια εντολή bgcolor δεν θα εφαρμοστεί. Παραδείγματα έγκυρων τιμών: 'white', 'ffff00', 'ffff0080', '128,64,32' και '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Επιλέξτε τη μορφή για την επεξεργασμένη εικόνα. Μια προεπιλεγμένη τιμή σημαίνει ότι δεν θα εφαρμοστεί μια εντολή μορφής."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Επεξεργασία προφίλ πολυμέσων"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Το όνομα του προφίλ πολυμέσων."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Η υπόδειξη για το προφίλ πολυμέσων."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Επιλέξτε το πλάτος για την επεξεργασμένη εικόνα. Μια προεπιλεγμένη τιμή σημαίνει ότι μια εντολή πλάτους δεν θα εφαρμοστεί."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Επιλέξτε το ύψος για την επεξεργασμένη εικόνα. Μια προεπιλεγμένη τιμή σημαίνει ότι δεν θα εφαρμοστεί η εντολή ύψους."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Επιλέξτε τη λειτουργία αλλαγής μεγέθους για την επεξεργασμένη εικόνα."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Επιλέξτε το χρώμα φόντου για την επεξεργασμένη εικόνα. Μια κενή τιμή σημαίνει η εντολή bgcolor δεν θα εφαρμοστεί. Παραδείγματα έγκυρων τιμών: 'λευκό', 'ffff00', 'ffff0080', '128,64,32' και '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Επιλέξτε τη μορφή για την επεξεργασμένη εικόνα. Μια προεπιλεγμένη τιμή σημαίνει ότι δεν θα εφαρμοστεί μια εντολή μορφοποίησης."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Αντιστροφή"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Δημιουργία φακέλου"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Μετονομασία αντικειμένου"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Πολυμέσα"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,46 +1085,46 @@ msgid "Exports all or specified media."
 msgstr "Εξάγει όλα ή συγκεκριμένα πολυμέσα."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Μικρές Μινιατούρες"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Μεγάλες Μινιατούρες"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
-msgstr ""
+msgstr "Αυτό το αρχείο υπερβαίνει το μέγιστο μέγεθος μεταφόρτωσης"
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
-msgstr ""
+msgstr "Μεταφορτώσεις"
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
-msgstr ""
+msgstr "Σφάλματα"
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
-msgstr ""
+msgstr "Καθαρισμός Σφαλμάτων"
 
 #. <option value="Attached" selected="@(currentEditor == "Attached")">@T["Attached"]</option>
 #: OrchardCore.Media\Views\MediaField-Attached.Option.cshtml:4
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Επισυνάφθηκε"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Καθιερωμένο"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Μικρές Μινιατούρες"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Μεγάλες Μινιατούρες"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Επιλογή Πολυμέσων"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Εντάξει"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1226,7 +1226,7 @@ msgstr "Θα απορριφθεί κατά την αποθήκευση"
 #: OrchardCore.Media\Views\Shared\MediaFieldEditLocalization.cshtml:11
 msgctxt "OrchardCore.Media.Views.Shared.MediaFieldEditLocalization"
 msgid "No Files"
-msgstr ""
+msgstr "Δεν υπάρχουν αρχεία"
 
 #. <h5 class="modal-title">@T["Enter media text"]</h5>
 #: OrchardCore.Media\Views\Shared\MediaFieldEditMediaTextModal.cshtml:5
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Επιτρέπεται η επιλογή σημείου αγκύρωσης για αλλαγή μεγέθους."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
@@ -1310,25 +1310,25 @@ msgstr "Το κείμενο υπόδειξης για εμφάνιση στον
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Allow all default media types"
-msgstr ""
+msgstr "Να επιτρέπονται όλοι οι προεπιλεγμένοι τύποι μέσων"
 
 #. <span class="hint dashed">@T["This will allow the user to attach any accessible file from the media library."]</span>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "This will allow the user to attach any accessible file from the media library."
-msgstr ""
+msgstr "Αυτό θα επιτρέψει στο χρήστη να επισυνάψει οποιοδήποτε προσβάσιμο αρχείο από τη βιβλιοθήκη πολυμέσων."
 
 #. <label class="form-check-label cursor-pointer" for="@htmlId">@T["{0} types", group.Key]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "{0} types"
-msgstr ""
+msgstr "{0} τύποι"
 
 #. <span class="hint dashed">@T["Select all extensions with the '{0}' type.", group.Key]</span>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:63
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Select all extensions with the '{0}' type."
-msgstr ""
+msgstr "Επιλέξτε όλες τις επεκτάσεις με τον τύπο \"{0}\"."
 
 #. <span class="icon"><i class="fa-solid fa-images" aria-hidden="true"></i></span><span class="title">@T["Media"]</span>
 #: OrchardCore.Media\Views\NavigationItemText-media.Id.cshtml:1
@@ -1418,25 +1418,25 @@ msgstr "Το μέγιστο μέγεθος ενός μεταφορτωμένου
 #: OrchardCore.Media\Views\Admin\Options.cshtml:54
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "Max upload chunk size"
-msgstr ""
+msgstr "Μέγιστο μέγεθος κομματιού μεταφόρτωσης"
 
 #. <span class="hint">@T["The maximum chunk size when uploading files in bytes. If 0 or null, no chunked upload is used."]</span>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:57
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "The maximum chunk size when uploading files in bytes. If 0 or null, no chunked upload is used."
-msgstr ""
+msgstr "Το μέγιστο μέγεθος κομματιού κατά τη μεταφόρτωση αρχείων σε byte. Εάν είναι 0 ή null, δε χρησιμοποιείται τεμαχισμένη μεταφόρτωση."
 
 #. <label asp-for="TemporaryFileLifetime" class="col-sm-2 col-form-label">@T["Temporary file lifetime"]</label>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:62
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "Temporary file lifetime"
-msgstr ""
+msgstr "Διάρκεια ζωής προσωρινού αρχείου"
 
 #. <span class="hint">@T["The lifetime of temporary files created during upload."]</span>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:65
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "The lifetime of temporary files created during upload."
-msgstr ""
+msgstr "Η διάρκεια ζωής των προσωρινών αρχείων που δημιουργήθηκαν κατά τη μεταφόρτωση."
 
 #. <label asp-for="CdnBaseUrl" class="col-sm-2 col-form-label">@T["Cdn base url"]</label>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:70
diff --git a/Localization/el/OrchardCore.Menu.po b/Localization/el/OrchardCore.Menu.po
index 3486fcb036443..6f7fb6dc53ece 100644
--- a/Localization/el/OrchardCore.Menu.po
+++ b/Localization/el/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Μενού"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Το στοιχείο μενού διαγράφηκε με επιτυχία."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "Η δημοσίευση αυτού του στοιχείου περιεχομένου μπορεί να διαγράψει το δημιουργημένο περιεχόμενο. Διορθώστε τυχόν προβλήματα τύπου περιεχομένου εκ των προτέρων."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,23 +90,23 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Επεξεργασία {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
-msgstr ""
+msgstr "Html"
 
 #. <h4 class="card-title">@T["Html Menu Item"]</h4>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Thumbnail.cshtml:1
@@ -138,17 +138,17 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Δείτε την τεκμηρίωση"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
 #. <h4 class="card-title">@T["Link Menu Item"]</h4>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Thumbnail.cshtml:1
diff --git a/Localization/el/OrchardCore.Microsoft.Authentication.po b/Localization/el/OrchardCore.Microsoft.Authentication.po
index 355d89d881664..f76ab3f44ebc7 100644
--- a/Localization/el/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/el/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Ρυθμίσεις Ελέγχου Ταυτότητας Λογαριασμού της Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "Το ID της εφαρμογής εντοπίστηκε στις παραμέτρους της Microsoft developer portal."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Το κρυπτογραφημένο κλειδί της εφαρμογής βρίσκεται στις παραμέτρους της Microsoft developer portal."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -224,13 +224,13 @@ msgstr "Αποθηκεύστε εξωτερικά σύμβολα (tokens) αυθ
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
-msgstr ""
+msgstr "Ο τρέχων ενοικιαστής θα φορτωθεί ξανά όταν αποθηκευτούν οι ρυθμίσεις."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Microsoft.Authentication/#azure-active-directory" target="_blank">@T["See documentation"]</a>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "See documentation"
-msgstr ""
+msgstr "Δείτε την τεκμηρίωση"
 
 #. <h3>@T["Microsoft Entra ID Authentication Settings"]</h3>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:9
@@ -238,19 +238,19 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
-msgstr ""
+msgstr "Εμφανιζόμενο Όνομα"
 
 #. <span class="hint">@T["The display name of the provider."]</span>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "The display name of the provider."
-msgstr ""
+msgstr "Το εμφανιζόμενο όνομα του παρόχου."
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,11 +274,11 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
-msgstr ""
+msgstr "CallbackPath"
 
 #. <span class="hint">@T["The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."]</span>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:36
@@ -308,5 +308,5 @@ msgstr ""
 #: OrchardCore.Microsoft.Authentication\Views\NavigationItemText-microsoft.Id.cshtml:1
 msgctxt "OrchardCore.Microsoft.Authentication.Views.NavigationItemText-microsoft.Id"
 msgid "Microsoft"
-msgstr ""
+msgstr "Microsoft"
 
diff --git a/Localization/el/OrchardCore.Navigation.po b/Localization/el/OrchardCore.Navigation.po
index e4a4e6f839fbb..18caff947227f 100644
--- a/Localization/el/OrchardCore.Navigation.po
+++ b/Localization/el/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr "<<"
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr "<"
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ">"
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ">>"
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr "..."
diff --git a/Localization/el/OrchardCore.Notifications.po b/Localization/el/OrchardCore.Notifications.po
index 92787ddf8c4a2..7622b4b4f90cf 100644
--- a/Localization/el/OrchardCore.Notifications.po
+++ b/Localization/el/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr "Απέτυχε: δεν βρέθηκε χρήστης"
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr "Ανάγνωση"
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr "Δεν διαβάστηκε"
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr "Δημιουργήθηκε πρόσφατα"
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr "Δημιουργήθηκαν στο παρελθόν"
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "Σήμανση ως αναγνωσμένο"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "Σήμανση ως μη αναγνωσμένο"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr "Κατάργηση"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] "ειδοποίηση"
 msgstr[1] "ειδοποιήσεις"
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr "Σήμανση ως αναγνωσμένο"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr "Δεν βρέθηκαν ειδοποιήσεις."
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr "επιλεγμένο"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "Επιλογή Όλων"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] "1 αντικείμενο"
 msgstr[1] "{0} αντικείμενα"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr "Αντικείμενα {0} έως {1}"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
-msgstr "Ειδοποίηση χρήστη"
+msgid "Notify Content Owner"
+msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "Μπορείτε να χρησιμοποιήσετε τη σύνταξη Liquid."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,11 +378,11 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
-msgstr "Κοινοποιούν ιδιοκτήτη"
+msgid "Notify Content Owner"
+msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:2
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr "Ειδοποίηση χρήστη"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "Μπορείτε να χρησιμοποιήσετε τη σύνταξη Liquid."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "Όταν επιλεγεί, ο πάροχος ειδοποιήσεων θα χρησιμοποιήσει το σώμα HTML εάν υποστηρίζει HTML."
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] "ειδοποίηση"
-msgstr[1] "ειδοποιήσεις"
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr "Έχετε περισσότερες από {0} μη αναγνωσμένες {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr "Έχετε {0} μη αναγνωσμένες {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
-msgstr "Δεν έχετε μη αναγνωσμένες ειδοποιήσεις"
+msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
-msgstr "Κέντρο Ειδοποιήσεων"
+msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/el/OrchardCore.OpenId.po b/Localization/el/OrchardCore.OpenId.po
index 4bba30592b93f..76ee41b7c46cf 100644
--- a/Localization/el/OrchardCore.OpenId.po
+++ b/Localization/el/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Το όνομα έχει ήδη κρατηθεί από άλλο σκοπό."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Η διαμόρφωση του διακομιστή OpenID ενημερώθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Η διαμόρφωση επικύρωσης OpenID ενημερώθηκε με επιτυχία."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Δημιουργήστε μια νέα εφαρμογή"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Id Πελάτη"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Εμφανιζόμενο Όνομα"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Οι εμπιστευτικές εφαρμογές ΠΡΕΠΕΙ να στείλουν το μυστικό του πελάτη τους όταν επικοινωνούν με τα τελικά σημεία των συμβόλων και της ανάκλησης. Αυτό εγγυάται ότι μόνο ο νόμιμος πελάτης μπορεί να ανταλλάξει έναν κωδικό εξουσιοδότησης ή να πάρει ένα σύμβολο (token) ανανέωσης."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Να επιτρέπεται η ανανέωση ροής Συμβόλου (Token)"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Να Επιτρέπεται το Τελικό Σημείο Αποσύνδεσης"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Δημιουργία νέου σκοπού"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Εμφανιζόμενο Όνομα"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Σημείωση: Ο ενοικιαστής διακομιστή περιλαμβάνεται πάντα στο αρχείο πρόσβασης συμβόλου (token), ακόμα κι αν δεν ζητηθεί εύρος."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Επεξεργαστείτε μια εφαρμογή"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Id Πελάτη"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Εμφανιζόμενο Όνομα"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Οι εμπιστευτικές εφαρμογές ΠΡΕΠΕΙ να στείλουν το μυστικό πελάτη τους όταν επικοινωνούν με τα τελικά σημεία token και της ανάκλησης. Αυτό εγγυάται ότι μόνο ο νόμιμος πελάτης μπορεί να ανταλλάξει έναν κωδικό εξουσιοδότησης ή να πάρει ένα ανανεωμένο σύμβολο (token)."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Μυστικό Πελάτη"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Να Επιτρέπεται η Ανανέωση Ροής Συμβόλου (Token)"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Επεξεργαστείτε ένα σκοπό"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Εμφανιζόμενο Όνομα"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Σημείωση: Ο ενοικιαστής διακομιστή περιλαμβάνεται πάντα στο αρχείο πρόσβασης συμβόλου (token), ακόμα κι αν δεν ζητηθεί εύρος."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ο τρέχων ενοικιαστής θα φορτωθεί ξανά όταν αποθηκευτούν οι ρυθμίσεις."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Εμφανιζόμενο όνομα του IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Η αρχή εξουσιοδότησης να χρησιμοποιεί κατά την πραγματοποίηση κλήσεων του OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "το 'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Η διαδρομή αιτήματος μέσα στη βασική διαδρομή της εφαρμογής όπου θα επιστραφεί ο user-agent. Το middleware θα επεξεργαστεί αυτό το αίτημα όταν φθάνει."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Δες το post_logout_redirect_uri από "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "Το uri όπου θα μεταφερθεί ο user-agent μετά από την αποσύνδεση της εφαρμογής από τον πάροχο ταυτότητας. Η ανακατεύθυνση θα συμβεί μετά την κλήση του SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Κώδικα Ροής Ελέγχου Ταυτότητας"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "δες: "
@@ -1217,15 +1217,15 @@ msgstr "Χρησιμοποίησε τον τύπο απόκρισης 'code'"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "παράδειγμα:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Χρησιμοποίησε τον τύπο απόκρισης 'code token'"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Άρρητη Ροή Ελέγχου Ταυτότητας"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Χρησιμοποίησε τον τύπο απόκρισης 'id_token'"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Χρησιμοποίησε τον τύπο απόκρισης 'id_token token'"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Λειτουργία Απόκρισης"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Ρύθμισε τη λειτουργία απάντησης δες: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Μυστικό Πελάτη"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "ορίστε μυστικό πελάτη."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr "Όνομα παραμέτρου"
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr "Τιμή"
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr "Αφαίρεση παραμέτρου από τη λίστα"
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr "Προσθέστε μια παράμετρο"
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr "Επεξεργασία δεδομένων"
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr "Παράμετροι"
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Μια αναπαράσταση JSON των επιτρεπόμενων τιμών, π.χ. {0}"
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "Εντάξει"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr "Προηγμένες Παράμετροι"
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr "Προηγμένες παράμετροι που μπορούν να αποσταλούν με το αίτημα εξουσιοδότησης."
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Αυτές οι επιλογές είναι όλες προαιρετικές και είναι μόνο για προχωρημένους χρήστες."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "Η βασική διεύθυνση URL του εξυπηρετητή ταυτότητας (αυτoύ του ιστότοπου). Αν δεν παρέχεται καμία διεύθυνση, τότε υπολογίζεται αυτόματα μια προεπιλεγμένη τιμή που βασίζεται στον υπολογιστή που φιλοξενεί τον ιστότοπο."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "Επιλέξτε τη θέση του πιστοποιητικού κρυπτογράφησης."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "Επιλέξτε το χώρο αποθήκευσης πιστοποιητικών κρυπτογράφησης."
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Πρέπει να προσθέσετε ένα πιστοποιητικό στο διακομιστή σας για τη ρύθμιση της μονάδας σύνδεσης OpenID."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "Επιλέξτε τη θέση του πιστοποιητικού υπογραφής."
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "Επιλέξτε τη θέση του πιστοποιητικού υπογραφής."
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "Όταν αυτή η επιλογή είναι ενεργοποιημένη, τα σύμβολα (tokens) ανανέωσης δεν επισημαίνονται ως εξαργυρωμένα και μπορούν να χρησιμοποιηθούν ξανά μέχρι να λήξουν. "
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ο τρέχων ενοικιαστής θα φορτωθεί ξανά όταν αποθηκευτούν οι ρυθμίσεις."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Εξουσιοδότηση Διακομιστή Ενοικιαστής"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "Η διεύθυνση του απομακρυσμένου διακομιστή σύνδεσης OpenID. Η χρήση μιας διεύθυνσης HTTPS συνιστάται ιδιαίτερα."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/el/OrchardCore.Placements.po b/Localization/el/OrchardCore.Placements.po
index ed1ffd8dad218..3708423d95c97 100644
--- a/Localization/el/OrchardCore.Placements.po
+++ b/Localization/el/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "Υπάρχουν ήδη κανόνες τοποθέτησης για το \"{0}\". Παρακαλώ επεξεργαστείτε τον υπάρχοντα κανόνα."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "Η τοποθέτηση \"{0}\" έχει αποθηκευτεί."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "Η τοποθέτηση \"{0}\" είναι κενή."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "Η τοποθέτηση \"{0}\" διαγράφηκε."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "Παρουσιάστηκε σφάλμα κατά την ανάλυση της τοποθέτησης<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση της τοποθέτησης."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "Οι τοποθετήσεις καταργήθηκαν με επιτυχία."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "Επεξεργασία Τοποθέτησης"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "Ο τύπος του σχήματος."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/el/OrchardCore.ProjectTemplates.po b/Localization/el/OrchardCore.ProjectTemplates.po
index 2a4ed099bf2ec..c438175ddfef4 100644
--- a/Localization/el/OrchardCore.ProjectTemplates.po
+++ b/Localization/el/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Προβολή"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/el/OrchardCore.PublishLater.po b/Localization/el/OrchardCore.PublishLater.po
index 994d9b6f91e5a..6d6ac8d7f4222 100644
--- a/Localization/el/OrchardCore.PublishLater.po
+++ b/Localization/el/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 20:25\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Δημοσίευση Αργότερα"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Ακύρωση Δημοσίευσης Αργότερα"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/el/OrchardCore.Queries.po b/Localization/el/OrchardCore.Queries.po
index 5d2b89c4570ea..bc184b01f91bd 100644
--- a/Localization/el/OrchardCore.Queries.po
+++ b/Localization/el/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Εκτέλεση Ερωτήματος SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Παρουσιάστηκε σφάλμα κατά την εκτέλεση του ερωτήματος SQL: {0}"
@@ -292,7 +292,7 @@ msgstr "Αναζήτηση"
 #: OrchardCore.Queries\Views\Query-Sql.Link.cshtml:6
 msgctxt "OrchardCore.Queries.Views.Query-Sql.Link"
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. <p class="hint">@T["Queries the SQL database."]</p>
 #: OrchardCore.Queries\Views\Query-Sql.Link.cshtml:7
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "Ερώτημα SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "Το ερώτημα SQL χρησιμοποιεί τυπική σύνταξη SQL92 και μετατρέπεται με βάση την πραγματική βάση δεδομένων. Οι πίνακες θα προστεθούν αυτόματα."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Ερώτημα"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Το τεχνικό όνομα του ερωτήματος."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr "Σημείωση: Το ερώτημα πρέπει να ρυθμιστεί ώστε να επιστρέφει Έγγραφα."
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Όταν είναι επιλεγμένο, το αποτέλεσμα πρέπει να είναι μια λίστα από ids εγγράφων."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/el/OrchardCore.ReCaptcha.Core.po b/Localization/el/OrchardCore.ReCaptcha.Core.po
index 70efa1348a224..56a510e2b91b6 100644
--- a/Localization/el/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/el/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Αποτυχία επικύρωσης του captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Αποτυχία επικύρωσης του captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Η γλώσσα με το όνομα {0} δεν βρέθηκε"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/el/OrchardCore.ReCaptcha.po b/Localization/el/OrchardCore.ReCaptcha.po
index de144033c8200..955ab47dc61af 100644
--- a/Localization/el/OrchardCore.ReCaptcha.po
+++ b/Localization/el/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Εξάγει τις ρυθμίσεις ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Επαλήθευση της εργασίας ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Επικύρωση"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Έγκυρο"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Μη έγκυρο"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Η επικύρωση Captcha απέτυχε. Προσπάθησε ξανά."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ο τρέχων ενοικιαστής θα φορτωθεί ξανά όταν αποθηκευτούν οι ρυθμίσεις."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Το κλειδί ιστότοπου reCaptcha της Google."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/el/OrchardCore.Recipes.Core.po b/Localization/el/OrchardCore.Recipes.Core.po
index 9c62b7d1cd560..f5ea90e632827 100644
--- a/Localization/el/OrchardCore.Recipes.Core.po
+++ b/Localization/el/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-17 17:14\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/el/OrchardCore.Roles.po b/Localization/el/OrchardCore.Roles.po
index 1ed2fab422b68..74db0895384e3 100644
--- a/Localization/el/OrchardCore.Roles.po
+++ b/Localization/el/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Ρόλοι"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Μη έγκυρο όνομα ρόλου."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Ο ρόλος ενημερώθηκε με επιτυχία."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Δεν είναι δυνατή η διαγραφή των ρόλων του συστήματος."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Δημιουργία Ρόλου"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Όνομα ρόλου"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Επεξεργασία Λεπτομερειών Ρόλου"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Δικαιώματα"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Αυτή η άδεια θα μπορούσε να επιτρέψει σε ένα χρήστη να ανυψώσει τα άλλα του δικαιώματα. Παραχωρήστε το με εξαιρετική προσοχή."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Άκυρο"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Ρόλοι"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/el/OrchardCore.Rules.po b/Localization/el/OrchardCore.Rules.po
index 63b779d9caf69..7817cc62e44ad 100644
--- a/Localization/el/OrchardCore.Rules.po
+++ b/Localization/el/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-04-12 14:50\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Όλα"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Οποιαδήποτε"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "Τύπος περιεχομένου"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Πολιτισμός"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Επιλέξτε τον τελεστή λειτουργίας."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "Ρόλος"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/el/OrchardCore.Search.Elasticsearch.po b/Localization/el/OrchardCore.Search.Elasticsearch.po
index 3cff49563d313..7adbb3e0ce071 100644
--- a/Localization/el/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/el/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr "Επαναφορά"
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr "Εκτέλεση"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/el/OrchardCore.Search.Lucene.po b/Localization/el/OrchardCore.Search.Lucene.po
index 3a4bfd33b2ffd..59fe40f513cc8 100644
--- a/Localization/el/OrchardCore.Search.Lucene.po
+++ b/Localization/el/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr "Επαναφορά"
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr "Οποιοσδήποτε πολιτισμός"
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Όλα"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr "Εκτέλεση"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr "Ερωτήματα Lucene"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr "Δημιουργία"
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/el/OrchardCore.Search.po b/Localization/el/OrchardCore.Search.po
index 1cb3c4932f78f..2dda941ff6bc0 100644
--- a/Localization/el/OrchardCore.Search.po
+++ b/Localization/el/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/el/OrchardCore.Security.po b/Localization/el/OrchardCore.Security.po
index f43e9b0fda10a..4665a2fbd3d8c 100644
--- a/Localization/el/OrchardCore.Security.po
+++ b/Localization/el/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/el/OrchardCore.Seo.po b/Localization/el/OrchardCore.Seo.po
index 2f36939d0d293..d98f2e2624c8f 100644
--- a/Localization/el/OrchardCore.Seo.po
+++ b/Localization/el/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "Εάν θα αποδοθούν μεταδεδομένα για αυτήν τη σελίδα."
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr "Αντικαταστήστε τον προεπιλεγμένο τίτλο της σελίδας του προγράμματος περιήγησης που αυτό-δημιουργήθηκε (συνιστάται να διατηρείται κάτω από 70 χαρακτήρες)."
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr "Η μετα-περιγραφή προς απόδοση για αυτήν τη σελίδα."
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr "Οι meta-λέξεις-κλειδιά προς απόδοση για αυτήν τη σελίδα, χωρίζονται με κόμμα."
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr "Παράκαμψη της προεπιλεγμένης τεχνικης ονομασίας διεύθυνσης url."
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Επεξεργασία δεδομένων"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Ο τίτλος χρησιμοποιείται από προεπιλογή, μετά ο Τίτλος της Σελίδας ή μπορεί να παρακαμφθεί από εδώ."
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/el/OrchardCore.Settings.po b/Localization/el/OrchardCore.Settings.po
index 7f7e75a8747ab..3f2dcd5ea7b24 100644
--- a/Localization/el/OrchardCore.Settings.po
+++ b/Localization/el/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Οι ρυθμίσεις ενημερώθηκαν επιτυχώς."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Η βασική διεύθυνση URL πρέπει να είναι μια πλήρως κατάλληλη διεύθυνση URL."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Ρυθμίσεις Ιστοσελίδας"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/el/OrchardCore.Setup.Core.po b/Localization/el/OrchardCore.Setup.Core.po
index c0bf204f3308b..4b2a039eed701 100644
--- a/Localization/el/OrchardCore.Setup.Core.po
+++ b/Localization/el/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/el/OrchardCore.Setup.po b/Localization/el/OrchardCore.Setup.po
index 777adc5477b29..c68cccbb68f10 100644
--- a/Localization/el/OrchardCore.Setup.po
+++ b/Localization/el/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Δεν είναι δυνατή η δημιουργία ενός ιστότοπου χωρίς συνταγή."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Χρησιμοποιείται ως προεπιλεγμένος τίτλος των σελίδων σας."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Οι συνταγές, σας επιτρέπουν να ρυθμίσετε τον ιστότοπο σας με πρόσθετες προρυθμισμένες επιλογές, λειτουργίες και ρυθμίσεις εκτός κουτιού."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Καθορίζει την προεπιλεγμένη ζώνη ώρας που χρησιμοποιείται κατά την εμφάνιση και την επεξεργασία ημερομηνιών και χρόνων."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Η βάση δεδομένων χρησιμοποιείται για την αποθήκευση της διαμόρφωσης του ιστότοπου και των περιεχομένων της."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Μπορείτε να καθορίσετε ένα πρόθεμα πίνακα εάν σκοπεύετε να χρησιμοποιήσετε ξανά την ίδια βάση δεδομένων για πολλούς ιστότοπους."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Εμφάνιση/απόκρυψη συμβολοσειράς σύνδεσης"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Ο υπέρ-χρήστης έχει όλα τα δικαιώματα. Θα πρέπει να χρησιμοποιείται μόνο κατά τη διάρκεια της εγκατάστασης και για ανάκτηση μετά από καταστροφή."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Όνομα χρήστη"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Αυτό το email δεν είναι έγκυρο."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Δύναμη Κωδικού"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/el/OrchardCore.Shortcodes.po b/Localization/el/OrchardCore.Shortcodes.po
index 03911b498604c..bbe751b3cf9a5 100644
--- a/Localization/el/OrchardCore.Shortcodes.po
+++ b/Localization/el/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Το περιεχόμενο του προτύπου είναι υποχρεωτικό."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Το πρότυπο δεν περιέχει έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Το πρότυπο του Shortcode διαγράφηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Τα πρότυπα Shortcode καταργήθηκαν με επιτυχία."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "Δημιουργία Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "Το όνομα του shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "Η υπόδειξη για το shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "Παράδειγμα χρήσης του shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "Οι κατηγορίες για αυτόν το shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "Η προεπιλεγμένη τιμή του shortcode όταν επιλεχθεί. Προεπιλογές σε [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "Επεξεργασία Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "Το όνομα του shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "Η υπόδειξη για το shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "Παράδειγμα χρήσης του shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "Οι κατηγορίες για αυτόν το shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "Η προεπιλεγμένη τιμή του shortcode όταν επιλεχθεί. Προεπιλογές σε [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/el/OrchardCore.Sitemaps.po b/Localization/el/OrchardCore.Sitemaps.po
index cd1a8d61e1eda..b5e6913f5e8d5 100644
--- a/Localization/el/OrchardCore.Sitemaps.po
+++ b/Localization/el/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Η ιδιότητα \"Base url\" των ρυθμίσεων ιστότοπου είναι κενή, αλλά απαιτείται για τη δημιουργία χαρτών ιστότοπου."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -303,13 +303,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Η ιδιότητα \"Base url\" των ρυθμίσεων ιστότοπου είναι κενή, αλλά απαιτείται για τη δημιουργία χαρτών ιστότοπου."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -333,7 +333,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Αποεπίλεξε για απενεργοποίηση της δρομολόγησης στο ευρετήριο του χάρτη ιστότοπου."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -381,7 +381,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -393,7 +393,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -405,7 +405,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -561,13 +561,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Η ιδιότητα \"Base url\" των ρυθμίσεων ιστότοπου είναι κενή, αλλά απαιτείται για τη δημιουργία χαρτών ιστότοπου."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -615,13 +615,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Η ιδιότητα \"Base url\" των ρυθμίσεων ιστότοπου είναι κενή, αλλά απαιτείται για τη δημιουργία χαρτών ιστότοπου."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Όνομα"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -645,7 +645,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Αποεπίλεξε για απενεργοποίηση της δρομολόγησης στο ευρετήριο του χάρτη ιστότοπου."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1021,7 +1021,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Επίλεξε για να εξαιρέσεις αυτό το στοιχείο περιεχομένου από τον χάρτη ιστότοπου."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1033,7 +1033,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Η συχνότητα αυτού του στοιχείου περιεχομένου είναι πιθανό να αλλάξει."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/el/OrchardCore.Sms.po b/Localization/el/OrchardCore.Sms.po
index 46b4f545a7a96..73bb2d46b9b5f 100644
--- a/Localization/el/OrchardCore.Sms.po
+++ b/Localization/el/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/el/OrchardCore.Spatial.po b/Localization/el/OrchardCore.Spatial.po
index cd92e472a0786..b8d867b552136 100644
--- a/Localization/el/OrchardCore.Spatial.po
+++ b/Localization/el/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "Επεξεργαστής Leaflet"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Εάν απαιτείται μια τιμή."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/el/OrchardCore.Taxonomies.po b/Localization/el/OrchardCore.Taxonomies.po
index d69f1d8e81a28..72182746e94f3 100644
--- a/Localization/el/OrchardCore.Taxonomies.po
+++ b/Localization/el/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Απαιτείται τιμή για το \"{0}\""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Φίλτρα Ταξινομίας"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Ετικέτες"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Δεν ήταν δυνατή η εύρεση της ταξινομίας. Ελέγξτε τις ρυθμίσεις για αυτό το πεδίο."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Σφάλμα κατά τη δημιουργία ετικέτας"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Επιλογή"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Πατήστε enter για να δημιουργήσετε μια ετικέτα"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Δεν βρέθηκαν ετικέτες"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Ετικέτες"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Καθιερωμένο"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Δεν βρέθηκε ταξινομία. Ελέγξτε τις ρυθμίσεις για αυτό το πεδίο."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Καθιερωμένο"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Το κείμενο υπόδειξης που θα εμφανιστεί για αυτό το πεδίο στον επεξεργαστή κειμένου."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Ταξινομία"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Απαιτείται"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Εάν έχει επιλεγεί τουλάχιστον ένα στοιχείο."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Μοναδικό"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Εάν μπορεί να επιλεγεί μόνο ένα στοιχείο."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Μόνο Φύλλα"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Εάν τα φύλλα είναι τα μόνα στοιχεία που μπορούν να επιλεγούν."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Εάν μπορούν να δημιουργηθούν νέες ετικέτες inline. Σημείωση: Κατά τη δημιουργία ενσωματωμένων ετικετών θα οριστεί μόνο η ιδιότητα όρου κειμένου εμφάνισης."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Όρος Τύπος Περιεχόμενου"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Προσθήκη {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Έχετε αναδιατάξει την ταξινομία."
diff --git a/Localization/el/OrchardCore.Templates.Cms.Module.po b/Localization/el/OrchardCore.Templates.Cms.Module.po
index 59c6748dd1ae5..c1f6ed174c710 100644
--- a/Localization/el/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/el/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Προβολή"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/el/OrchardCore.Templates.po b/Localization/el/OrchardCore.Templates.po
index 9a23823306916..c309df49d6105 100644
--- a/Localization/el/OrchardCore.Templates.po
+++ b/Localization/el/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Το πρότυπο \"{0}\" έχει δημιουργηθεί."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Το πρότυπο διαγράφηκε επιτυχώς."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Το περιεχόμενο καταργήθηκε με επιτυχία."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Το όνομα του προτύπου."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Η περιγραφή του προτύπου."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Το όνομα του προτύπου."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Η περιγραφή του προτύπου."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/el/OrchardCore.Tenants.po b/Localization/el/OrchardCore.Tenants.po
index 134620fc33f64..feca6a77b5836 100644
--- a/Localization/el/OrchardCore.Tenants.po
+++ b/Localization/el/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Ενοικιαστές"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Όλες οι καταστάσεις"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Σε εκτέλεση"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Μη αρχικοποιημένο"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Όνομα"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Κατάσταση"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Εργοποίηση"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Δεν μπορείτε να απενεργοποιήσετε τον προεπιλεγμένο ενοικιαστή."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Ο ενοικιαστής '{0}' είναι ήδη απενεργοποιημένος."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Ο ενοικιαστής '{0}' είναι ήδη εργοποιημένος."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Μπορείτε να ενεργοποιήσετε μόνο έναν Απενεργοποιήμενο ενοικιαστή."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Ο ενοικιαστής δεν βρέθηκε: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Ο ενοικιαστής δεν μπορεί να ρυθμιστεί."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Ο πάροχος της βάσης δεδομένων δεν έχει οριστεί."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Η συμβολοσειρά σύνδεσης είναι υποχρεωτική για αυτόν τον πάροχο της βάσης δεδομένων."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Απαιτείται είτε το \"Recipe\" είτε το \"RecipeName\"."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Η συνταγή {0} δεν βρέθηκε."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Δημιουργία Ενοικιαστή"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Δημιουργία Ενοικιαστή"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Επίλεξε το όνομα του ενοικιαστή για δημιουργία."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Προαιρετικό) η περιγραφή του ενοικιαστή που θα δημιουργήσει."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Παράδειγμα: Εάν ο κεντρικός εξυπηρετητής είναι \"orchardproject.net\", η διεύθυνση ιστότοπου του ενοικιαστή είναι \"http://orchardproject.net/\". Με υποστήριξη Liquid."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Τι είδους βάση δεδομένων πρέπει να χρησιμοποιηθεί;"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Πρόθεμα Πίνακα"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Συμβολοσειρά σύνδεσης"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Συνταγή"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Απενεργοποίηση Ενοικιαστή"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Επεξεργασία Ενοικιαστή"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Εργοποίηση Ενοικιαστή"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Ενεργοποίηση ενοικιαστή."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Σχέδιο"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Διαμόρφωση Ενοικιαστή"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Επέλεξε το όνομα του ενοικιαστή για να τον διαμόρφωσεις."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Ονομα ιστοσελίδας"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Όνομα χρήστη διαχειριστή"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Ηλεκτρονική διεύθυνση διαχειριστή"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Κωδικός διαχειριστή"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Τι είδους βάση δεδομένων πρέπει να χρησιμοποιηθεί;"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Πρόθεμα Πίνακα"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Συμβολοσειρά σύνδεσης"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/el/OrchardCore.Tests.po b/Localization/el/OrchardCore.Tests.po
index 05f96233d2ef5..8cf8349932351 100644
--- a/Localization/el/OrchardCore.Tests.po
+++ b/Localization/el/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/el/OrchardCore.Themes.po b/Localization/el/OrchardCore.Themes.po
index ce6c4111aaf66..fbef69d8403ba 100644
--- a/Localization/el/OrchardCore.Themes.po
+++ b/Localization/el/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Εξάγει το τρέχων επιλεγμένο θέμα του ιστότοπου και το θέμα διαχειριστή."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/el/OrchardCore.Title.po b/Localization/el/OrchardCore.Title.po
index 3e16081bbc696..e6a8aca72313c 100644
--- a/Localization/el/OrchardCore.Title.po
+++ b/Localization/el/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Απαιτείται μια τιμή για τον τίτλο."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Το μοτίβο δεν περιέχει μια έγκυρη έκφραση Liquid. Λεπτομέρειες: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Ο τίτλος θα δημιουργηθεί αυτόματα χρησιμοποιώντας το μοτίβο."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Επιλέξτε για την αποτύπωση του τίτλου σε προβολές οθόνης."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/el/OrchardCore.Twitter.po b/Localization/el/OrchardCore.Twitter.po
index 6f34a4479f8f6..73c1e4b096b9b 100644
--- a/Localization/el/OrchardCore.Twitter.po
+++ b/Localization/el/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Το μυστικό σύμβολο (token) πρόσβασης είναι υποχρεωτικό"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Ενημέρωση Εργασιών Κατάστασης Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Κοινωνικά"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Τέλος"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Απέτυχε"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ο τρέχων ενοικιαστής θα φορτωθεί ξανά όταν αποθηκευτούν οι ρυθμίσεις."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Ρυθμίσεις ενσωμάτωσης στο Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Κλειδί API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Το κλειδί API που ορίζεται στην καρτέλα Κλειδιά και tokens του πίνακα ελέγχου της εφαρμογής twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Μυστικό κλειδί API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Ο μυστικός κωδικός API που ορίζεται στην καρτέλα Κλειδιά και tokens του πίνακα ελέγχου της εφαρμογής twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Σύμβολο (Token) πρόσβασης"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Το Σύμβολο (token) πρόσβασης που ορίζεται στην καρτέλα Κλειδιά και tokens του πίνακα ελέγχου της εφαρμογής twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Μυστικό Σύμβολο (token) πρόσβασης"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Το μυστικό (token) πρόσβασης στην καρτέλα Κλειδιά και tokens του πίνακα ελέγχου της εφαρμογής twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Συνδεθείτε με τις Ρυθμίσεις Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Ενημέρωση κατάστασης Twitter"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/el/OrchardCore.Users.Core.po b/Localization/el/OrchardCore.Users.Core.po
index 7d2fba08d608a..7b8040a9b73ce 100644
--- a/Localization/el/OrchardCore.Users.Core.po
+++ b/Localization/el/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου '{0}' δεν είναι έγκυρη."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Μη αναμενόμενο σφάλμα: '{0}'."
diff --git a/Localization/el/OrchardCore.Users.po b/Localization/el/OrchardCore.Users.po
index 6df2abb3c9059..dacc42a8ff25e 100644
--- a/Localization/el/OrchardCore.Users.po
+++ b/Localization/el/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Ο χρήστης δημιουργήθηκε με επιτυχία"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Η τοπική σύνδεση είναι απενεργοποιημένη."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Ο λογαριασμός έχει κλειδωθεί"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Μη έγκυρη απόπειρα σύνδεσης."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Ο κωδικός πρόσβασής σας άλλαξε επιτυχώς."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Παρουσιάστηκε σφάλμα στον εξωτερικό πάροχο."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Ο ιστότοπος δεν επιτρέπει την εγγραφή χρήστη."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Επιβεβαιώστε τον λογαριασμό σας"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Ο συγκεκριμένος χρήστης δεν επιτρέπεται να συνδεθεί."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Πρέπει να επιβεβαιώσεις το email σου."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Όλοι οι Χρήστες"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Ενεργοποιημένοι χρήστες"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Απενεργοποιημένοι χρήστες"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Όνομα"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Έγκριση"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Εργοποίηση"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Όλοι οι ρόλοι"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Επικυρωμένος (χωρίς ρόλους)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Ο χρήστης {0} εγκρίθηκε επιτυχώς."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Ο χρήστης {0} διαφράφηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Ο χρήστης {0} απενεργοποιήθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Ο χρήστης {0} ενεργοποιήθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Ο χρήστης δημιουργήθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Ο χρήστης ενημερώθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Χρήστης διαγράφηκε με επιτυχία."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Δεν ήταν δυνατή η διαγραφή αυτού του χρήστη."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Ο Κωδικός πρόσβασης τροποποιήθηκε με επιτυχία."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Ο χρήστης ξεκλειδώθηκε με επιτυχία."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Δεν ήταν δυνατό το ξεκλείδωμα του χρήστη."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Ρυθμίσεις σύνδεσης"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Εξάγει τις ρυθμίσεις σύνδεσης."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Αλλαγή ρυθμίσεων e-mail"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Εξάγει τις ρυθμίσεις αλλαγής email."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Ρυθμίσεις εγγραφής"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Εξάγει τις ρυθμίσεις εγγραφής."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Επαναφορά ρυθμίσεων κωδικού πρόσβασης"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Εξάγει τις ρυθμίσεις Επαναφορά κωδικού πρόσβασης."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Ο νέος κωδικός πρόσβασης και ο κωδικός επιβεβαίωσης δεν ταιριάζουν."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Εργασία ανάθεσης ρόλων χρήστη"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Χρήστης"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Απέτυχε"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Εγγραφή εργασίας χρήστη"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Χρήστης"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Έγκυρο"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Μη έγκυρο"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Δεν διατίθεται υπηρεσία ηλεκτρονικού ταχυδρομείου"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Συμβάν ενημερωμένο από το χρήστη"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Χρήστης"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Επικύρωση εργασίας χρήστη"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Ανώνυμος"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Επικυρωμένος"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Απαιτείται μια τιμή για το {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} σε ρόλο {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Ο χρήστης για να καταχωρηθεί. Με υποστήριξη Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Τρέχων κωδικός πρόσβασης"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Νέος κωδικός πρόσβασης"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Δημιουργία χρήστη"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Επεξεργασία κωδικού πρόσβασης"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Νέος κωδικός πρόσβασης"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Ελέγξτε το email σας για να επαναφέρετε τον κωδικό πρόσβασής σας."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Αλλαγή Email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Έγινε επιτυχής επιβεβαίωση με τη ταυτότητα σας με <strong> {0} </strong>. Έχετε ήδη λογαριασμό με αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Εισαγάγετε τον τοπικό κωδικό πρόσβασης του λογαριασμού σας και κάντε κλικ στο κουμπί Εγγραφή για να συνδέσετε τους λογαριασμούς και να ολοκληρώσεις τη σύνδεση."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Είσοδος"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Χρησιμοποιήστε άλλη υπηρεσία για να συνδεθείτε"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Συνδεθείτε χρησιμοποιώντας τον λογαριασμό σας {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Δημιουργία νέου λογαριασμού."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "Λογαριασμός ηλεκτρονικού ταχυδρομείου"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Κωδικός πρόσβασης"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Η ταυτότητα σας επιβεβαίωθηκε επιτυχώς με <strong> {0} </strong>. Συμπληρώστε την παρακάτω φόρμα και κάντε κλικ στο κουμπί Εγγραφή για να ολοκληρώσετε την εγγραφή."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Κωδικός"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Αποστολή email επιβεβαίωσης"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Το θέμα του μηνύματος. Υποστηρίζει Liquid σύνταξη."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Αρχική"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Επαναφορά κωδικού πρόσβασης"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "Λογαριασμός ηλεκτρονικού ταχυδρομείου"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Νέος κωδικός πρόσβασης"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Ο χρήστης είναι απενεργοποιημένος."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Ο χρήστης είναι ενεργοποιημένος."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Καταργήστε την επιλογή για να απενεργοποιήσετε αυτόν τον λογαριασμό χρήστη."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Ρόλοι"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/el/OrchardCore.Widgets.po b/Localization/el/OrchardCore.Widgets.po
index 08f2fe8dfe115..128f4cea323c6 100644
--- a/Localization/el/OrchardCore.Widgets.po
+++ b/Localization/el/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Προσθήκη Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Τυπικό"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/el/OrchardCore.Workflows.po b/Localization/el/OrchardCore.Workflows.po
index 354f75b7a177e..bbe931c92bf8c 100644
--- a/Localization/el/OrchardCore.Workflows.po
+++ b/Localization/el/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Εκτέλεση εργασιών συναλλαγής"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Συνεδρία"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Έγκυρο"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Μη έγκυρο"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Εργασία Συσχετισμού"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Πρωτόγονα"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Για κάθε εργασία"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Έλεγχος ροής"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Επαναλέγω"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Εργασία Fork"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Έλεγχος Ροής"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Εργασία For Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Έλεγχος Ροής"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Επανάληψη"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Εργασία If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Έλεγχος ροής"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Αληθές"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Ψευδές"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Συμμετοχή στην Εργασία"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Έλεγχος Ροής"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Εντάχθηκαν"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Εργασία καταγραφής"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Πρωτόγονα"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Εξαιρέσεις"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Εργασία ειδοποίησης"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Περιβάλλον [UI]"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Εργασία Script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Έλεγχος Ροής"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Ορίστε την Εργασία Εξόδου"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Πρωτόγονα"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Εργασία Ορισμού Προτεραιότητας"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Πρωτόγονα"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Εργασία While Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Έλεγχος Ροής"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Επανάληψη"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Η δραστηριότητα ενημερώθηκε με επιτυχία."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Δημιουργήθηκε πρόσφατα"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Δημιουργήθηκε το λιγότερο πρόσφατο"
@@ -324,83 +324,115 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Λανθασμένα"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Ολοκληρωμένα"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Η ροή εργασίας {0} έχει διαγραφεί."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "30/5000\n"
 "Η ροή εργασίας {0} έχει διαγραφεί."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Η ροή εργασίας έχει αποθηκευτεί."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Η ροή εργασίας {0} διαγράφηκε"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Εργασία ανακατεύθυνσης Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Αίτημα Συμβάντος Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
@@ -424,37 +456,37 @@ msgid "Matched"
 msgstr "Ταιριάζουν"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Αίτηση Εργασίας Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Μη ελεγχόμενη κατάσταση Http"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Εργασία Ανταπόκρισης Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
@@ -513,19 +545,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Δεν είναι εξουσιοδοτημένο να ενεργοποιεί το '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Εργασία εκκίνησης"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -537,7 +569,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -631,7 +663,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Συσχετισμός"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -733,14 +765,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Πίσω"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -763,7 +809,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -823,7 +869,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -835,7 +881,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -871,7 +917,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Διαθέσιμα γεγονότα"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -883,7 +929,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Διαθέσιμες Εργασίες"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -907,7 +953,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή τη δραστηριότητα;"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -935,6 +981,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Φίλτρο"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -971,7 +1023,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1031,7 +1083,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1043,7 +1095,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1079,7 +1131,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Επανάληψη <em> {0} </em> πάνω από το <em> {1} </em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1091,7 +1143,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Η λίστα για επανάληψη. Με υποστήριξη JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1133,7 +1185,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Καμία Διακλάδωση"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1169,7 +1221,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Επανάληψη <em>{0}</em> από <em>{1}</em> έως <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1181,7 +1233,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Η τιμή έναρξης. Με υποστήριξη JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1193,7 +1245,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Η τιμή τέλους. Με υποστήριξη JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1205,7 +1257,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Η τιμή Βήματος βρόχου. Με υποστήριξη JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1235,7 +1287,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Ανακατεύθυνση HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1248,13 +1300,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "Η διεύθυνση URL για την ανακατεύθυνση. Με υποστήριξη Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Μόνιμο"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Επιλέξτε εάν η ανακατεύθυνση πρέπει να είναι μόνιμη (301). Αφήστε αποεπιλεγμένο για προσωρινή ανακατεύθυνση (302)."
@@ -1277,7 +1329,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Διαχείριση της εισερχόμενης αίτησης HTTP"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1313,36 +1365,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Όποιος επικαλεστεί αυτήν τη διεύθυνση URL θα ενεργοποιήσει αυτή τη ροή εργασίας. Κρατήστε το σε ασφαλές μέρος."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Επικύρωση του Antiforgery Συμβόλου (Token)"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Αποεπιλέξτε αυτή την επιλογή εάν το αίτημα προέρχεται από μια υπηρεσία που καλεί αυτήν τη διεύθυνση URL ως webhook. Αν αυτή η διεύθυνση URL ζητηθεί από μια φόρμα, κρατήστε αυτη την επιλογή επιλεγμένη για να βεβαιωθείτε ότι οι τιμές της φόρμας δεν έχουν αλλοιωθεί."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Διάρκεια ζωής του Συμβόλου (Token)"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Κάντε κλικ στο κουμπί <b>Αναδημιουργία</b> μετά την αλλαγή αυτής της τιμής."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Αριθμός ημερών για να λήξει το σύμβολο (token). βάλτε 0 για να μην λήξει ποτέ το σύμβολο (token)"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1361,7 +1425,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Φιλτράρισμα εισερχόμενης αίτησης HTTP"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1373,7 +1437,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Η μέθοδος HTTP που ταιριάζει."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1385,7 +1449,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Το όνομα του controller που ταιριάζει."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1397,7 +1461,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Το όνομα δράσης που ταιριάζει."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1433,7 +1497,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1445,7 +1509,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "Η διεύθυνση URL για την αποστολή του αιτήματος. Υποστηρίζει τη σύνταξη Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1457,7 +1521,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "Η μέθοδος HTTP. Για παράδειγμα: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1469,7 +1533,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Ο τύπος περιεχομένου των αιτήσεων του σώματος."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1481,7 +1545,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Το σώμα που στέλνει με POST, PUT και PATCH αιτήματα. Με υποστήριξη Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1493,7 +1557,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Παρέχετε πρόσθετες κεφαλίδες HTTP, μία ανά γραμμή. Για παράδειγμα: Εξουσιοδότηση: Φορέας 123ABC. Με την υποστήριξη Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1523,7 +1587,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "Απόκριση HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1535,7 +1599,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Ο κωδικός κατάστασης HTTP για αποστολή. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\"> Κάντε κλικ εδώ </a> για μια πλήρη λίστα."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1547,7 +1611,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Ο τύπος περιεχομένου του σώματος απόκρισης."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1559,7 +1623,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Το σώμα που στέλνει πίσω. Με υποστήριξη Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1595,7 +1659,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Αξιολογήστε <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1707,40 +1771,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Ταξινόμηση"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την παρουσία ροής εργασίας;"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Δημιουργήθηκε {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Δεν υπάρχει τίποτα εδώ! </strong> Δεν υπάρχουν σταματημένες ροές εργασίας προς το παρόν."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Πίσω"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "επιλεγμένα"
@@ -1839,13 +1917,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 περίπτωση"
-msgstr[1] "{0} περιπτώσεις"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1879,7 +1955,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Περίμενε <strong>οποιωνδήποτε</strong> εισερχόμενη δραστηριότητα προτού να συνδεθείς στην εκτέλεση σε μια μοναδική διαδρομή."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1909,7 +1985,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Καταγραφή"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1921,7 +1997,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Το επίπεδο καταγραφής."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1969,7 +2045,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "Ανακοίνωση για {0}"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1981,7 +2057,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Ο τύπος ειδοποίησης."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2011,7 +2087,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2023,7 +2099,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Μια λίστα διαχωρισμένη με κόμματα των διαθέσιμων αποτελεσμάτων."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2053,7 +2129,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Έξοδος μέσω {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2065,7 +2141,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2095,7 +2171,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Ορισμός της ιδιότητας {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2107,7 +2183,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Η ιδιότητα που πρέπει να ρυθμίσετε. Εάν η καθορισμένη ιδιότητα δεν υπάρχει, τότε θα προστεθεί."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2143,7 +2219,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Όταν ενεργοποιείται το <em>{0}</em>"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2179,7 +2255,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2233,7 +2309,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Δεν έχουν οριστεί ενέργειες χρηστών"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2245,7 +2321,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Καταχωρίστε ένα ή περισσότερα ονόματα ενεργειών διαχωριζόμενα με κόμμα."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2281,7 +2357,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2305,3 +2381,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Επανάληψη όσο μία συνθήκη είναι αληθής."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/el/OrchardCore.po b/Localization/el/OrchardCore.po
index 831574f0ffb4e..0339704899bab 100644
--- a/Localization/el/OrchardCore.po
+++ b/Localization/el/OrchardCore.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-07-18 16:32\n"
+"PO-Revision-Date: 2023-10-25 13:09\n"
 
 #. context.ErrorMessage = S["The tenant should not be the '{0}' tenant.", ShellSettings.DefaultShellName];
 #: OrchardCore\Shell\Removing\ShellRemovalManager.cs:45
@@ -34,41 +34,41 @@ msgstr "Αποτυχία δημιουργίας \"ShellContext\" πριν από
 #: OrchardCore\Shell\Removing\ShellRemovalManager.cs:86
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellRemovalManager"
 msgid "Failed to acquire a lock before executing the tenant handlers."
-msgstr ""
+msgstr "Απέτυχε η απόκτηση κλειδώματος πριν από την εκτέλεση των χειριστών ενοικιαστών."
 
 #. context.ErrorMessage = S["Failed to execute the tenant handler '{0}'.", type];
 #: OrchardCore\Shell\Removing\ShellRemovalManager.cs:119
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellRemovalManager"
 msgid "Failed to execute the tenant handler '{0}'."
-msgstr ""
+msgstr "Απέτυχε η εκτέλεση του προγράμματος χειρισμού ενοικιαστή \"{0}\"."
 
 #. context.ErrorMessage = S["Failed to acquire a lock before executing the host handlers."];
 #: OrchardCore\Shell\Removing\ShellRemovalManager.cs:139
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellRemovalManager"
 msgid "Failed to acquire a lock before executing the host handlers."
-msgstr ""
+msgstr "Απέτυχε η απόκτηση κλειδώματος πριν από την εκτέλεση των κεντρικών χειριστών."
 
 #. context.ErrorMessage = S["Failed to execute the host handler '{0}'.", type];
 #: OrchardCore\Shell\Removing\ShellRemovalManager.cs:174
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellRemovalManager"
 msgid "Failed to execute the host handler '{0}'."
-msgstr ""
+msgstr "Απέτυχε η εκτέλεση του προγράμματος χειρισμού κεντρικού υπολογιστή \"{0}\"."
 
 #. context.ErrorMessage = S["Failed to remove the shell settings."];
 #: OrchardCore\Shell\Removing\ShellSettingsRemovingHandler.cs:48
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellSettingsRemovingHandler"
 msgid "Failed to remove the shell settings."
-msgstr ""
+msgstr "Αποτυχία κατάργησης των ρυθμίσεων κελύφους."
 
 #. context.ErrorMessage = S["Failed to remove the site folder '{0}'.", shellAppDataFolder];
 #: OrchardCore\Shell\Removing\ShellSiteFolderRemovingHandler.cs:70
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellSiteFolderRemovingHandler"
 msgid "Failed to remove the site folder '{0}'."
-msgstr ""
+msgstr "Απέτυχε η κατάργηση του φακέλου \"{0}\"."
 
 #. context.ErrorMessage = S["Failed to remove the web root folder '{0}'.", shellWebRootFolder];
 #: OrchardCore\Shell\Removing\ShellWebRootRemovingHandler.cs:74
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellWebRootRemovingHandler"
 msgid "Failed to remove the web root folder '{0}'."
-msgstr ""
+msgstr "Αποτυχία κατάργησης του ριζικού φακέλου ιστού \"{0}\"."
 
diff --git a/Localization/el/TheAdmin.po b/Localization/el/TheAdmin.po
index 91d8042c036ce..583a9848ec9db 100644
--- a/Localization/el/TheAdmin.po
+++ b/Localization/el/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Φωτεινή λειτουργία"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Σκοτεινή λειτουργία"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Επίσκεψη Ιστοτόπου"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Σύμπτυξη / επέκταση μενού"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Είστε βέβαιος(α) ότι θέλετε να αφαιρέσετε αυτό το στοιχείο;"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Εντάξει"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Ακύρωση"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/el/TheAgencyTheme.po b/Localization/el/TheAgencyTheme.po
index 5449cba74d9eb..0b2fbdef530c4 100644
--- a/Localization/el/TheAgencyTheme.po
+++ b/Localization/el/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Δεν υπάρχει κανένα αποτέλεσμα."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Η σελίδα δεν βρέθηκε"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Η σελίδα που ζητήσατε δεν βρέθηκε."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/el/TheBlogTheme.po b/Localization/el/TheBlogTheme.po
index 5753c456b254c..cc991bf34b911 100644
--- a/Localization/el/TheBlogTheme.po
+++ b/Localization/el/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "στις {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Δεν υπάρχει κανένα αποτέλεσμα."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Η σελίδα Δεν Βρέθηκε"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/el/TheTheme.po b/Localization/el/TheTheme.po
index 3c41018e9e60b..e83fcecad79ae 100644
--- a/Localization/el/TheTheme.po
+++ b/Localization/el/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Καλώς ορίσατε στο Orchard Core, ο ιστότοπός σας έχει ρυθμιστεί με επιτυχία."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/es/OrchardCore.Admin.po b/Localization/es/OrchardCore.Admin.po
index b118b77dc6657..e441eda5c7d87 100644
--- a/Localization/es/OrchardCore.Admin.po
+++ b/Localization/es/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Admin"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Ajustes de Admin"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exportar los ajustes de Administración."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Bienvenido a Orchard"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "No dude en consultar el menú de la izquierda y descubrir todas sus posibilidades."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Establecer modo oscuro al tema"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Si se puede mostrar un tema de administración en modo oscuro."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Si los títulos se muestran en la barra superior."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/es/OrchardCore.AdminDashboard.po b/Localization/es/OrchardCore.AdminDashboard.po
index 8d694b927dad2..f9bfaa33b0bab 100644
--- a/Localization/es/OrchardCore.AdminDashboard.po
+++ b/Localization/es/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Posición"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Ancho"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/es/OrchardCore.AdminMenu.po b/Localization/es/OrchardCore.AdminMenu.po
index 0b5ed5ce89796..fa445dbd45dda 100644
--- a/Localization/es/OrchardCore.AdminMenu.po
+++ b/Localization/es/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:20\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Crear Menú de Admin {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nombre"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Crear Nodo"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Editar Menú de Administrador: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nombre"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Editar Nodo"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "La prioridad que tiene este enlace para ser mostrado como activo en lugar de otro cuando ambos apuntan a la misma Dirección de Recursos en Internet. El enlace con mayor prioridad tendrá el estado de activo en la navegación."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "El orden de posición de este enlace en el menú de Administrador."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Enlace"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "El texto del enlace tal como se mostrará en el menú."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "El Enlace de la Dirección del Recurso en Internet. El enlace sólo se mostrará si tiene al menos un descendiente con una Dirección de Internet. La Dirección del Recurso de Internet será relativa a la raíz del Administrador"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Seleccione un icono"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Contenedor"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "El texto del ítem de menú tal como aparecerá en árbol."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Seleccionar"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Seleccione un icono a mostrar cuando el ítem de menú es de primer nivel."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Seleccione un icono"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Permisos"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Escriba para buscar"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Seleccionar"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "No se encontraron resultados"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Los permisos necesarios para mostrar este elemento de menú (opcional)."
diff --git a/Localization/es/OrchardCore.Alias.po b/Localization/es/OrchardCore.Alias.po
index b81ceec26dfe0..c8c8e34ef3a7b 100644
--- a/Localization/es/OrchardCore.Alias.po
+++ b/Localization/es/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "El Patrón no contiene una expresión Liquid válida. Detalles: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Dejar vacío para regenerarlo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Se genera el alias y la entrada está desactivada"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/es/OrchardCore.ArchiveLater.po b/Localization/es/OrchardCore.ArchiveLater.po
index 5cf84e8e222ab..8640809109970 100644
--- a/Localization/es/OrchardCore.ArchiveLater.po
+++ b/Localization/es/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/es/OrchardCore.AuditTrail.po b/Localization/es/OrchardCore.AuditTrail.po
index add1b02556225..6b7621fa5eeaa 100644
--- a/Localization/es/OrchardCore.AuditTrail.po
+++ b/Localization/es/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Registro de auditoria"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Intervalo de fechas personalizado"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Registro de auditoria"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Si la tarea de trimming está deshabilitada."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "El número de días que se mantiene un evento."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/es/OrchardCore.Autoroute.po b/Localization/es/OrchardCore.Autoroute.po
index c3334c20b90ac..16c621a09f6b2 100644
--- a/Localization/es/OrchardCore.Autoroute.po
+++ b/Localization/es/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Su permalink es demasiado largo. El permalink puede tener {0} como máximo."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Marca para desactivar la ruta automática para este elemento de contenido."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Marcar para especificar que un elemento de contenido secundario será enrutado a una ruta absoluta."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/es/OrchardCore.BackgroundTasks.po b/Localization/es/OrchardCore.BackgroundTasks.po
index f41ae90e4fe6d..c43b6a1527e7b 100644
--- a/Localization/es/OrchardCore.BackgroundTasks.po
+++ b/Localization/es/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-22 07:32\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Avanzado"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Valor de tiempo de bloqueo no válido en la pestaña avanzada"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Ignorado si no hay ninguna función de bloqueo distribuida habilitada."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/es/OrchardCore.ContentFields.po b/Localization/es/OrchardCore.ContentFields.po
index 6a95b1121d45d..439d8d04bf09c 100644
--- a/Localization/es/OrchardCore.ContentFields.po
+++ b/Localization/es/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:20\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Cambiar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "No hay elementos de contenido."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Estándar"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "No publicado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Escriba para buscar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Seleccionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "No se hallaron resultados"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Para permitir que varios elementos se puedan seleccionar."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Mostrar Todos los Tipos de Contenido"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Los tipos de contenido a mostrar. Elegir al menos uno."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Localizado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si es obligatorio un valor."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si es obligatorio un valor."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Introduzca las opciones del editor, el idioma siempre se establece en `html` cuando se guarda."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentación de opciones"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Si la url se utiliza cuando se selecciona de Insert Media (por defecto, se inserta el Liquid Tag)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentación de opciones"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Texto del enlace"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Si es obligatoria una Url."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Usar la url del enlace"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Una sugerencia (marcador) a mostrar cuando el campo para la url está vacío."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Una sugerencia (marcador) a mostrar cuando el campo para el texto está vacío."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Una url válida propuesta cuando se crea un conten item."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "No hay elementos de contenido."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Estándar"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "No publicado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Escriba para buscar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Seleccionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "No se encontraron resultados"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Si permite seleccionar varios elementos."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Los tipos de contenido a mostrar. Elija al menos uno."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Lista de Checkbox"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Tipo de búsqueda"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Seleccionar"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "No se han encontrado valores"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Este valor es obligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Editar Datos"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Una representación JSON de los valores permitidos, por ejemplo {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Rango"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Ninguno"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Cargando"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si es obligatorio un valor."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Una sugerencia que se mostrará cuando la entrada está vacía. (opcional)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "El número de dígitos después del punto decimal."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "El valor mínimo permitido. (opcional)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "El valor máximo permitido. (opcional)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Introduzca las opciones del editor."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentación de opciones"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Editar Datos"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Una representación JSON de los valores permitidos, por ejemplo {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si es obligatorio un valor."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si es obligatorio un valor."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Por segundos, utilice un divisor de 60, p. ej., '15', para ms un decimal igual a un divisor de 1000 dividido por 1000, p. ej. '0.250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "No hay usuarios."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Estándar"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Desactivado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Escriba para buscar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Seleccionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "No se han encontrado resultados"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Si se permite seleccionar varios elementos."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Permite que el selector muestre todos los tipos de contenido."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "El texto de sugerencia mostrar para este campo en el editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Requerido"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Si es obligatorio un valor."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Sugerencia"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Ancho"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "El ancho del Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Alto"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "El alto del Videobox"
diff --git a/Localization/es/OrchardCore.ContentLocalization.po b/Localization/es/OrchardCore.ContentLocalization.po
index c0186a862af05..4758826495ece 100644
--- a/Localization/es/OrchardCore.ContentLocalization.po
+++ b/Localization/es/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "No se pudo crear la versión localizada del elemento de contenido."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/es/OrchardCore.ContentPreview.po b/Localization/es/OrchardCore.ContentPreview.po
index 99eddae5c5f77..ac83f7e3d93b4 100644
--- a/Localization/es/OrchardCore.ContentPreview.po
+++ b/Localization/es/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "El patrón no contiene una expresión Liquid válida. Detalles: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Previsualizar"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Previsualización desconectada"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Error de Previsualización"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/es/OrchardCore.ContentTypes.po b/Localization/es/OrchardCore.ContentTypes.po
index a333e4a675637..56b6c2294fadf 100644
--- a/Localization/es/OrchardCore.ContentTypes.po
+++ b/Localization/es/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Partes de Contenido"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "El nombre a visualizar no puede estar vacío."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Un tipo con el mismo Nombre de Visualización ya existe."
@@ -66,10 +66,10 @@ msgstr "Un tipo con el mismo Nombre de Visualización ya existe."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "El Nombre Técnico no puede estar vacío."
@@ -78,10 +78,10 @@ msgstr "El Nombre Técnico no puede estar vacío."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "El nombre técnico debe comenzar con una letra."
@@ -90,10 +90,10 @@ msgstr "El nombre técnico debe comenzar con una letra."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "El nombre técnico contiene caracteres inválidos."
@@ -101,133 +101,133 @@ msgstr "El nombre técnico contiene caracteres inválidos."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "El nombre técnico está reservado para uso interno."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Una parte con el mismo Nombre Técnico ya existe."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Se ha creado el tipo de contenido \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Se han guardado los ajustes de \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "Se ha eliminado \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Se ha añadido la parte \"{0}\"."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Una parte con el mismo Nombre de Visualización ya existe."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Una parte con el mismo Nombre Técnico ya existe."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Se ha eliminado la parte \"{0}\"."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "No se ha podido crear la parte de contenido."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Se ha creado la parte de contenido \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Se han guardado los ajustes de \"{0}\"."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Ya existe un campo con el mismo Nombre de Visualización."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Ya existe un campo con el mismo Nombre Técnico."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Se ha añadido el campo \"{0}\"."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Se ha cambiado el nombre a mostrar a {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Se han guardado los ajustes del campo \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Se ha eliminado el campo \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Se han guardado los ajustes de la parte \"{0}\"."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "El nombre del Tipo de Contenido no puede estar vacío."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "No se puede añadir la parte llamada \"{0}\". Ya existe otra con ese mismo nombre."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Añadir nuevo campo a \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nombre del campo tal como será mostrado."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Añadir Parte con Nombre a \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Nombre de la parte reutilizable tal como será mostrada."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Nombre técnico de la parte reutilizable."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Exporta definiciones especificadas de tipo de contenido y partes para actualizar."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Nombre técnico de la parte reutilizable."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Nombre de la parte tal como será mostrado. Dejar en blanco para usar los valores por defecto."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Marcar para permitir que esta parte pueda ser adjuntada varias veces."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Nombre técnico del tipo."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nombre del tipo tal como será mostrado."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Nuevo Tipo de Contenido"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nombre del tipo tal como será mostrado."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Nueva Parte de Contenido"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Crear"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Una lista separada por comas de definiciones de tipo de contenido a eliminar"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Exporta definiciones especificadas de tipo de contenido y partes para su eliminación."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Editar Tipo de Contenido - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Campos"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Editar"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Eliminar"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Modo de visualización"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Añadir Campo"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Partes"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Contiene los campos del tipo actual"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Añadir Partes"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Añadir Parte con Nombre"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Guardar"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Eliminar"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" ajustes para \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nombre del campo tal como será mostrado."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Nombre técnico del campo."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "¿Qué tipo de editor debe usarse?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "¿Qué tipo de modo de visualización debe usarse?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Guardar"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Algunos ajustes de partes comunes a todos los tipos también pueden definirse en el nivel de <a href=\"{0}\">Definición de Parte</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Nombre de la parte tal como será mostrada."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "La descripción de la parte tal como será mostrada."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "¿Qué tipo de editor debe usarse?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "¿Qué tipo de modo de visualización debe usarse?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Guardar"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Cancelar"
diff --git a/Localization/es/OrchardCore.Contents.po b/Localization/es/OrchardCore.Contents.po
index a0baf4ef0e4b0..836e871456f4e 100644
--- a/Localization/es/OrchardCore.Contents.po
+++ b/Localization/es/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "El {0} ha dejado de estar publicado."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Todos los tipos de contenido"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Ha ocurrido uno o más errores de validación."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Exporta la configuración del seguimiento de auditoría de contenido."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Contenido"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Hecho"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Registro de auditoria"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Si el comentario de la pista de auditoría se muestra durante la edición."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "La fecha en la que el elemento de contenido fue creado o fue publicado por primera vez."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "y continuar"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Acciones"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Contenido"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Borrador de contenido guardado."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Elementos de Contenido"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Mostrar Todos los Tipos de Contenido"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Seleccione un icono"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Mostrar Todos los Tipos de Contenido"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Limita la cantidad de elementos de contenido a proporcionar desde esta fuente. Nota: Sólo un tipo de contenido es seleccionable cuando esta opción está seleccionada."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "La frecuencia por defecto con la que estos tipos de contenido probablemente cambien."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Cualquier tipo de contenido"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Crear contenido"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Marcar si desea que el elemento de contenido sea publicado cuando sea creado. Deje sin marcar para crear una versión de borrador."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Eliminar contenido utilizando la expresión: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Ver borrador como JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Descargar borrador como JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Ver Publicado como JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Descarga publicada como JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Ver como JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "No se ha encontrado contenido de exportación para los planes de destino de implementación. Crea un plan de despliegue y añade un contenido de exportación para el paso de destino de despliegue a él."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Contenido"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Nuevo"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publicar contenido utilizando la expresión: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Recuperar contenido usando expresión: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "No Publicar contenido utilizando la expresión: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Actualizar contenido usando expresión: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Introduzca una expresión JavaScript que evalúe al ID del elemento de contenido (ContentItemId) para ser actualizado. Por ejemplo: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/es/OrchardCore.CustomSettings.po b/Localization/es/OrchardCore.CustomSettings.po
index bfc4956d2fb75..173d4d7a34227 100644
--- a/Localization/es/OrchardCore.CustomSettings.po
+++ b/Localization/es/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Ajustes personalizados"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/es/OrchardCore.Data.YesSql.po b/Localization/es/OrchardCore.Data.YesSql.po
index 13c25695d4c3a..0b37f6fbbd781 100644
--- a/Localization/es/OrchardCore.Data.YesSql.po
+++ b/Localization/es/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/es/OrchardCore.Demo.po b/Localization/es/OrchardCore.Demo.po
index 0152196646ef3..c484e17f2c5f9 100644
--- a/Localization/es/OrchardCore.Demo.po
+++ b/Localization/es/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Nombre"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Apellido"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/es/OrchardCore.Deployment.Remote.po b/Localization/es/OrchardCore.Deployment.Remote.po
index 54588be5d578d..955cc502cf925 100644
--- a/Localization/es/OrchardCore.Deployment.Remote.po
+++ b/Localization/es/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Envía el plan de despliegue a una instancia remota."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Nombre del Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Crear Instancia Remota"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Nombre de Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Editar Cliente Remoto"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Nombre de Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Editar Instancia Remota"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Nombre de Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/es/OrchardCore.Deployment.po b/Localization/es/OrchardCore.Deployment.po
index efe698600e953..ef4076aca65f3 100644
--- a/Localization/es/OrchardCore.Deployment.po
+++ b/Localization/es/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Importar JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Eliminar"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Planes de despliegue eliminados correctamente."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "El nombre es necesario."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Ya existe un plan de despliegue con el mismo nombre."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Plan de despliegue actualizado correctamente."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Plan de despliegue eliminado correctamente."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Crear Plan de Despliegue"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "El archivo personalizado a añadir como parte del plan."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "El nombre de archivo tal como será añadido en el archivo."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Planes de Despliegue"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Editar Plan de Despliegue"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "Receta JSON"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/es/OrchardCore.Diagnostics.po b/Localization/es/OrchardCore.Diagnostics.po
index 429c07f5a1424..8d4d16b63ffd9 100644
--- a/Localization/es/OrchardCore.Diagnostics.po
+++ b/Localization/es/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Su navegador envió una solicitud que este servidor no pudo entender."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Se ha producido un error al ejecutar esta solicitud."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "No tienes acceso a este recurso."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "No se pudo encontrar la página."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "No estás autorizado a ver este contenido."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/es/OrchardCore.Email.Abstractions.po b/Localization/es/OrchardCore.Email.Abstractions.po
index dbe790bad7fcb..97556a1a51798 100644
--- a/Localization/es/OrchardCore.Email.Abstractions.po
+++ b/Localization/es/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "El campo {0} es obligatorio."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "El método de entrega '{0}' no está soportado."
diff --git a/Localization/es/OrchardCore.Email.po b/Localization/es/OrchardCore.Email.po
index 07bb28961faff..9f6c3114aac7c 100644
--- a/Localization/es/OrchardCore.Email.po
+++ b/Localization/es/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Tarea de correo electrónico"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Mensajería"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Fallo"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Enviar correo electrónico"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "La dirección de correo electrónico del autor que define quién es el correo electrónico. Dejar en blanco para utilizar la dirección de correo electrónico configurada. Con soporte líquido."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "La dirección de correo electrónico del remitente. Requerida si no es la misma que la dirección de correo electrónico \"De\". Con soporte líquido."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "La dirección de correo electrónico de \"responder a\" es requerida si desea que las respuestas de correo electrónico se envíen a una dirección diferente a la de \"De\". Con soporte líquido."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "La lista de direcciones de correo electrónico de destinatarios separados por comas. Con soporte Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "La lista de direcciones de correo electrónico de destinatarios separados por comas. Con soporte Liquid."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "La lista de direcciones de correo electrónico de destinatarios separados por comas. Con soporte Liquid."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Si está marcado, indica que el cuerpo del mensaje de correo electrónico se enviará como HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Ajustes"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Para"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "El remitente es opcional, es útil cuando el autor del correo electrónico es diferente del remitente."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Cco"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Responder a"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Asunto"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Cuerpo"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "El tenant actual se recargará cuando se guarden los ajustes."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "La dirección de correo electrónico predeterminada a utilizar como remitente, a menos que el remitente de correo electrónico esté establecido."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Opciones de entrega de red"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "El dominio del servidor SMTP, por ejemplo. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "El puerto del servidor SMTP, normalmente 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "El servidor proxy es opcional."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "El puerto del proxy es opcional."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Cuando esta opción está seleccionada, el pool de aplicación o la identidad del proceso de host se utiliza para autentificarse con el servidor de correo."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "El nombre de usuario para la autenticación."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Directorio de Recolección especificado en las opciones de entrega"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "E.g. <i>C:\\Path\\To\\Tsu\\Sitio\\PickedUpEmail</i> para colocar correos electrónicos en un directorio de <i>PickedUpEmail</i> en la unidad C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/es/OrchardCore.Facebook.po b/Localization/es/OrchardCore.Facebook.po
index 5fd5b7268fe92..175ddc052b497 100644
--- a/Localization/es/OrchardCore.Facebook.po
+++ b/Localization/es/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Configuración de inicio de sesión"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "La ruta de solicitud dentro de la ruta base de la aplicación donde el user-agent será devuelto. El middleware procesará esta solicitud cuando llegue."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "La plantilla del plugin, en formato Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Versión de Javascript SDK"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Iniciar en cada página"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/es/OrchardCore.Features.po b/Localization/es/OrchardCore.Features.po
index 02e9fec110561..28ea2834f8879 100644
--- a/Localization/es/OrchardCore.Features.po
+++ b/Localization/es/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funcionalidades"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Seleccione una o más funcionalidades."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Acciones agrupadas"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Desactivar"
@@ -136,8 +136,8 @@ msgstr "Desactivar"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Activar"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Sin categoría"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Desactivar características"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Si"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "¡<strong>Nada aquí!</strong> ¡Tu búsqueda no ha devuelto resultados."
diff --git a/Localization/es/OrchardCore.Flows.po b/Localization/es/OrchardCore.Flows.po
index cd036f63d7170..368195d57849f 100644
--- a/Localization/es/OrchardCore.Flows.po
+++ b/Localization/es/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Añadir elemento"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Los tipos de contenido que puede contener, por ejemplo, Slide para un Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/es/OrchardCore.Forms.po b/Localization/es/OrchardCore.Forms.po
index 01d14ce1c9b6b..5eda4a54b2b7d 100644
--- a/Localization/es/OrchardCore.Forms.po
+++ b/Localization/es/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validación"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validación"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validación"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "No válido"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validación"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "No válido"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validación"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "No válido"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "El nombre del campo de formulario que tiene un valor no válido."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Enlaza los campos de formulario enviados al model state."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "El texto a mostrar en el botón."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "El tipo de botón."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "La ID a generar en este elemento del formulario."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "El nombre a generar en este elemento del formulario."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "La url a la que enviar el formulario."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "El método HTTP a usar cuando se envíe el formulario."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "El tipo de botón."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "El texto a mostrar cuando el campo no tiene un valor."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "El valor por defecto para este campo."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "El texto a mostrar cuando la textarea está vacía."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Validar <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "El nombre del campo de formulario a validar."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Comprueba si el formulario enviado contiene algún error de validación."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/es/OrchardCore.GitHub.po b/Localization/es/OrchardCore.GitHub.po
index afeef4d5e08b9..f6f4a3bce28e8 100644
--- a/Localization/es/OrchardCore.GitHub.po
+++ b/Localization/es/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/es/OrchardCore.Google.po b/Localization/es/OrchardCore.Google.po
index e793aec74e2b5..cab01fe593266 100644
--- a/Localization/es/OrchardCore.Google.po
+++ b/Localization/es/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Configuración de Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Configuración de Autenticación Google"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "El id cliente definido en la consola API de Google para la aplicación."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "El id cliente definido en la consola API de Google para la aplicación."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr "Configuración de Google Tag Manager"
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/es/OrchardCore.Html.po b/Localization/es/OrchardCore.Html.po
index 1bf594beda2ec..c1de6e138b8c7 100644
--- a/Localization/es/OrchardCore.Html.po
+++ b/Localization/es/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "El cuerpo del elemento de contenido."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Introduzca las opciones del editor, el idioma siempre se establece en `html` cuando se guarda."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentación de opciones"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Si la url se utiliza cuando se selecciona de Insert Media (por defecto, se inserta el Liquid Tag)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Introduzca las opciones del editor"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentación de opciones"
diff --git a/Localization/es/OrchardCore.Https.po b/Localization/es/OrchardCore.Https.po
index 9a447891a7108..df54295b6545a 100644
--- a/Localization/es/OrchardCore.Https.po
+++ b/Localization/es/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Especifica si una redirección permanente, 308 Moved Permanently, debe ser usada en lugar de una redirección temporal, 307 Found, cuando se redireccione a HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/es/OrchardCore.Infrastructure.Abstractions.po b/Localization/es/OrchardCore.Infrastructure.Abstractions.po
index e9d2131622324..54a9fb5ea7601 100644
--- a/Localization/es/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/es/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "No se encontró el interruptor \"{0}\""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Una propiedad \"{0}\" existe pero no está decorada con \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Error al convertir el valor \"{0}\" a \"{1}\" para el cambio \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Argumentos de comando \"{0}\" no coinciden con la definición de comando"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "Método \"{0}\" no soporta el cambio \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/es/OrchardCore.Layers.po b/Localization/es/OrchardCore.Layers.po
index 6851297123ad0..5a52fb9729bab 100644
--- a/Localization/es/OrchardCore.Layers.po
+++ b/Localization/es/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Crear Capa"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Descripción"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Editar Capa - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget movido correctamente. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Deshacer</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zonas"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Agregar Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Capas"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Seleccione una capa para mostrar sus widgets asociados."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Editar"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Eliminar"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Por favor, <a href=\"{0}\">crear una capa</a> antes de agregar Widgets"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Agregar"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Si está marcado, el título se renderizará con el widget."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "La capa con la que el widget debe estar asociado."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/es/OrchardCore.Liquid.po b/Localization/es/OrchardCore.Liquid.po
index dc5e2838c63ec..47b950fbf9b7c 100644
--- a/Localization/es/OrchardCore.Liquid.po
+++ b/Localization/es/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/es/OrchardCore.Lists.po b/Localization/es/OrchardCore.Lists.po
index 148f08c505c24..c752312bc049d 100644
--- a/Localization/es/OrchardCore.Lists.po
+++ b/Localization/es/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Representa un enlace al elemento de contenido padre, y el orden que el contenido está representado."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Representa un conjunto de elementos de contenido."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "La entrada de Blog especificada ya no existe. Favor crear una nueva Entrada en el Blog."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "No autorizado para eliminar este contenido"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "El nombre de usuario, correo o contraseña suministrado es incorrecto."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "La lista está vacía"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "El feed actual está disponible en <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Marque esta opción para habilitar el pedido manual de artículos."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Listas"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Añadir elemento de menú padre"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/es/OrchardCore.Localization.po b/Localization/es/OrchardCore.Localization.po
index d9d04e0ec800e..b4d4916ab4b92 100644
--- a/Localization/es/OrchardCore.Localization.po
+++ b/Localization/es/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Culturas"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Se requiere una cultura"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "El sitio ha sido reiniciado para que los ajustes surtan efecto."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Las culturas activas configuradas para el sitio."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Ajustes de cultura"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Exporta los ajustes de cultura."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Añadir cultura"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/es/OrchardCore.Markdown.po b/Localization/es/OrchardCore.Markdown.po
index afcae78a0ab5b..493f704db5ca3 100644
--- a/Localization/es/OrchardCore.Markdown.po
+++ b/Localization/es/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "El cuerpo del elemento de contenido, en formato Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/es/OrchardCore.Media.po b/Localization/es/OrchardCore.Media.po
index 6cbe831b198f8..8ff4d45193222 100644
--- a/Localization/es/OrchardCore.Media.po
+++ b/Localization/es/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "No se puede mover el medio porque ya existe un archivo con el mismo nombre"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "El perfil con el mismo nombre ya existe."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "El perfil ha sido eliminado correctamente."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Perfil de importación eliminado correctamente."
@@ -181,95 +181,95 @@ msgstr "Perfil de importación eliminado correctamente."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Predeterminado"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Tamaño personalizado"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Por defecto (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Máx"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Recortar"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Tablet"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "BoxPad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Min"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Extender"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Se produjo un error procesando los archivos."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Tanto si se obtienen los activos de un directorio superior como de todos los sub-directorios."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Crear perfil multimedia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "El nombre del perfil de los medios."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Sugerencia para el perfil de los medios."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Seleccione el ancho de la imagen procesada. Un valor por defecto significa que un comando de ancho no será aplicado."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Seleccione la altura de la imagen procesada. Un valor por defecto significa que no se aplicará un comando de altura."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Seleccione el modo de cambio de tamaño para la imagen procesada."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Seleccione el color de fondo para la imagen procesada. Un valor vacío significa que un comando bgcolor no será aplicado. Ejemplos de valores válidos: 'white', 'ffff00', 'ffff0080', '128,64,32' y '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Seleccione el formato para la imagen procesada. Un valor por defecto significa que no se aplicará un comando de formato."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Editar perfil multimedia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "El nombre del perfil de los medios."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Sugerencia para el perfil de los medios."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Seleccione el ancho de la imagen procesada. Un valor por defecto significa que un comando de ancho no será aplicado."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Seleccione la altura de la imagen procesada. Un valor por defecto significa que no se aplicará un comando de altura."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Seleccione el modo de cambio de tamaño para la imagen procesada."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Seleccione el color de fondo para la imagen procesada. Un valor vacío significa que un comando bgcolor no será aplicado. Ejemplos de valores válidos: 'white', 'ffff00', 'ffff0080', '128,64,32' y '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Seleccione el formato para la imagen procesada. Un valor por defecto significa que no se aplicará un comando de formato."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Invertir"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Crear Carpeta"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Renombrar elemento"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Medio"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Exportar todos o los medios especificados."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Imágenes Pequeñas"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Imágenes Grandes"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Adjuntos"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Imágenes Pequeñas"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Imágenes Grandes"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Seleccionar medios"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Aceptar"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Se permite seleccionar un punto de anclaje para redimensionar."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/es/OrchardCore.Menu.po b/Localization/es/OrchardCore.Menu.po
index 2669c1efef0ba..3997a135a0373 100644
--- a/Localization/es/OrchardCore.Menu.po
+++ b/Localization/es/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menus"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Elemento de Menú eliminado correctamente."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Editar {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Ver documentación"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/es/OrchardCore.Microsoft.Authentication.po b/Localization/es/OrchardCore.Microsoft.Authentication.po
index 6ca0ab8f08d02..8ee48edce5c9e 100644
--- a/Localization/es/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/es/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Configuración de autenticación de cuenta de Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "El ID de Aplicación hallado en los parámetros del portal de desarrolladores de Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "La llave secreta de Aplicación hallada en los parámetros del portal de Desarrolladores de Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/es/OrchardCore.Navigation.po b/Localization/es/OrchardCore.Navigation.po
index 6021f1bcdd013..e2a7c83be4682 100644
--- a/Localization/es/OrchardCore.Navigation.po
+++ b/Localization/es/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/es/OrchardCore.Notifications.po b/Localization/es/OrchardCore.Notifications.po
index c812eb302261b..3646436225917 100644
--- a/Localization/es/OrchardCore.Notifications.po
+++ b/Localization/es/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/es/OrchardCore.OpenId.po b/Localization/es/OrchardCore.OpenId.po
index beb33c72950e7..d6629e383a3c9 100644
--- a/Localization/es/OrchardCore.OpenId.po
+++ b/Localization/es/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Este nombre ya está siendo utilizado por otro alcance."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Configuración del servidor OpenID actualizada correctamente."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Configuración del servidor OpenID actualizada correctamente."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Crear una aplicación"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Cliente Id"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Las aplicaciones confidenciales deben enviar a su cliente secreto cuando se comunica con los puntos de entrada y revocación. Esto garantiza que sólo el cliente de confianza puede intercambiar un código de autorización u obtener un token de actualización."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Permitir Flujo Refrescar Token"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Permitir punto final de salida"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Crear un ámbito"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Editar una aplicación"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Cliente Id"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Las aplicaciones confidenciales deben enviar a su cliente secreto cuando se comunica con los puntos finales de entrada y revocación. Esto garantiza que sólo el cliente legit puede intercambiar un código de autorización u obtener un token de actualización."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Cliente Secreto"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Permitir Flujo Refrescar Token"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Editar un ámbito"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Nombre"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "El tenant actual se recargará cuando se guarden los ajustes."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Mostrar nombre del IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Autoridad a utilizar al realizar llamadas OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "el 'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "La ruta de solicitud dentro de la ruta base de la aplicación donde el user-agent será devuelto. El middleware procesará esta solicitud cuando llegue."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Ver desde post_logout_redirect_uri "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "La uri a la que se redirigirá el agente de usuario después de que la aplicación se haya desconectado del proveedor de identidad. La redirección se realizará después de que se invoca SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Flujo del Código de Autenticación"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "ver: "
@@ -1217,15 +1217,15 @@ msgstr "Usar tipo de respuesta 'código'"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "ejemplo:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Usar tipo de respuesta 'code token'"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Flujo de Autenticación Implícita"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Usar tipo de respuesta 'id_token'"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Usar tipo de respuesta 'id_token token'"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Modo de respuesta"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Configurar Modo de Respuesta: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Secreto del Cliente"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "establecer secreto del cliente."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Estas opciones son todas opcionales y son sólo para usuarios avanzados."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "La URL base del servidor de identidad (este sitio). Si no se proporciona ninguno, se calcula automáticamente un valor por defecto con base en el servidor del sitio."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Necesita agregar un certificado a su servidor para configurar el módulo OpenID Connect."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "El tenant actual se recargará cuando se guarden los ajustes."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Servidor tenant de autorización"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "La dirección del servidor remoto OpenID Connect. Se recomienda usar una dirección HTTPS."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/es/OrchardCore.Placements.po b/Localization/es/OrchardCore.Placements.po
index c3a9110879e1a..e305ae332a982 100644
--- a/Localization/es/OrchardCore.Placements.po
+++ b/Localization/es/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/es/OrchardCore.ProjectTemplates.po b/Localization/es/OrchardCore.ProjectTemplates.po
index 612f0295f230e..9f5253db85e8d 100644
--- a/Localization/es/OrchardCore.ProjectTemplates.po
+++ b/Localization/es/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Mostrar"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/es/OrchardCore.PublishLater.po b/Localization/es/OrchardCore.PublishLater.po
index 9d97b504a7a99..46798a2eb1820 100644
--- a/Localization/es/OrchardCore.PublishLater.po
+++ b/Localization/es/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2021-07-15 18:54\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/es/OrchardCore.Queries.po b/Localization/es/OrchardCore.Queries.po
index f9ddd4e79891c..64bf47547f203 100644
--- a/Localization/es/OrchardCore.Queries.po
+++ b/Localization/es/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Ejecutar consulta SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Se ha producido un error al ejecutar la consulta SQL: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "Consulta de SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "La consulta SQL utiliza sintaxis estándar SQL92 y se convierte desde la base de datos actual. El prefijo de tablas se agregará automáticamente."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Consulta"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "El nombre técnico de la consulta."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Cuando está marcado, el resultado debe ser una lista de identificadores de documento."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/es/OrchardCore.ReCaptcha.Core.po b/Localization/es/OrchardCore.ReCaptcha.Core.po
index 41b9fda915123..c9512b4391b8b 100644
--- a/Localization/es/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/es/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Error al validar el captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Error al validar el captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/es/OrchardCore.ReCaptcha.po b/Localization/es/OrchardCore.ReCaptcha.po
index 87c9284df0e1c..dcabf9a1a3f68 100644
--- a/Localization/es/OrchardCore.ReCaptcha.po
+++ b/Localization/es/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Validar tarea ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validación"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "No válido"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Falló la validación de Captcha. Inténtalo de nuevo."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "El tenant actual se recargará cuando se guarden los ajustes."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "La clave del sitio para Google reCaptcha."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/es/OrchardCore.Recipes.Core.po b/Localization/es/OrchardCore.Recipes.Core.po
index ab4bf23af237d..19d92e6406aaf 100644
--- a/Localization/es/OrchardCore.Recipes.Core.po
+++ b/Localization/es/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/es/OrchardCore.Roles.po b/Localization/es/OrchardCore.Roles.po
index 1d9a4e77ce3c6..325fc30393c09 100644
--- a/Localization/es/OrchardCore.Roles.po
+++ b/Localization/es/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Roles"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Nombre de usuario no válido."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rol actualizado correctamente."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "No se pueden eliminar roles del sistema."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Crear Rol"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Nombre de rol"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Editar detalle del rol"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Permisos"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Este permiso podría permitir a un usuario elevar sus otros permisos. Concederlo con extrema consideración."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/es/OrchardCore.Rules.po b/Localization/es/OrchardCore.Rules.po
index 0cb36d96a6ab1..fc36a52323d2e 100644
--- a/Localization/es/OrchardCore.Rules.po
+++ b/Localization/es/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-17 16:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/es/OrchardCore.Search.Elasticsearch.po b/Localization/es/OrchardCore.Search.Elasticsearch.po
index e5d5530a33cd4..54ae3dafbce1d 100644
--- a/Localization/es/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/es/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/es/OrchardCore.Search.Lucene.po b/Localization/es/OrchardCore.Search.Lucene.po
index 53e20c73efc20..95e40c7cdc5e1 100644
--- a/Localization/es/OrchardCore.Search.Lucene.po
+++ b/Localization/es/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/es/OrchardCore.Search.po b/Localization/es/OrchardCore.Search.po
index ee2f01a95773e..16c4beed166f0 100644
--- a/Localization/es/OrchardCore.Search.po
+++ b/Localization/es/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/es/OrchardCore.Security.po b/Localization/es/OrchardCore.Security.po
index 0f21ec99128a2..55d557c079c0f 100644
--- a/Localization/es/OrchardCore.Security.po
+++ b/Localization/es/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/es/OrchardCore.Seo.po b/Localization/es/OrchardCore.Seo.po
index 88162b9e7ce06..521999529c94a 100644
--- a/Localization/es/OrchardCore.Seo.po
+++ b/Localization/es/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/es/OrchardCore.Settings.po b/Localization/es/OrchardCore.Settings.po
index 331f017af37c1..10279e047dceb 100644
--- a/Localization/es/OrchardCore.Settings.po
+++ b/Localization/es/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Configuración del sitio actualizada correctamente."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Configuración del Sitio"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/es/OrchardCore.Setup.Core.po b/Localization/es/OrchardCore.Setup.Core.po
index 6b650010e1810..2bcd7a48c02bd 100644
--- a/Localization/es/OrchardCore.Setup.Core.po
+++ b/Localization/es/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/es/OrchardCore.Setup.po b/Localization/es/OrchardCore.Setup.po
index db3367ac99175..a50b0fa4a363a 100644
--- a/Localization/es/OrchardCore.Setup.po
+++ b/Localization/es/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "La contraseña debe tener al menos {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "No es posible configurar un sitio sin receta."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Esto se utiliza como el título por defecto de las páginas."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Las recetas le permiten configurar su sitio con opciones, características y opciones preconfiguradas adicionales listas para usar."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Determina la zona horaria predeterminada utilizada al mostrar y editar fechas y horas."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "La base de datos se utiliza para almacenar la configuración del sitio y su contenido."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Puede especificar un prefijo de tabla si tiene la intención de reutilizar la misma base de datos para varios sitios."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Mostrar/ocultar cadena de conexión"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "El superusuario tiene todos los derechos. Debe ser usado sólo durante la instalación y para la recuperación de desastres."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "El correo electrónico no es válido."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Seguridad de la Contraseña"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/es/OrchardCore.Shortcodes.po b/Localization/es/OrchardCore.Shortcodes.po
index bc414123e2837..36f80a9c094b7 100644
--- a/Localization/es/OrchardCore.Shortcodes.po
+++ b/Localization/es/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/es/OrchardCore.Sitemaps.po b/Localization/es/OrchardCore.Sitemaps.po
index 1f1e38491534d..5bc5a90e50a81 100644
--- a/Localization/es/OrchardCore.Sitemaps.po
+++ b/Localization/es/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/es/OrchardCore.Sms.po b/Localization/es/OrchardCore.Sms.po
index 8d43b04a496d9..3a5401caa1a0f 100644
--- a/Localization/es/OrchardCore.Sms.po
+++ b/Localization/es/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-21 15:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/es/OrchardCore.Spatial.po b/Localization/es/OrchardCore.Spatial.po
index 7fff1cb6109aa..20e9d1df2b23b 100644
--- a/Localization/es/OrchardCore.Spatial.po
+++ b/Localization/es/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/es/OrchardCore.Taxonomies.po b/Localization/es/OrchardCore.Taxonomies.po
index ace9f0de7bf96..4a2799e9ac5f4 100644
--- a/Localization/es/OrchardCore.Taxonomies.po
+++ b/Localization/es/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Es obligatorio un valor para '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Filtros de taxonomía"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Etiquetas"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "No se ha encontrado la taxonomía. Por favor, compruebe la configuración de este campo."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Error al crear etiqueta"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Escriba para buscar"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Seleccionar"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Pulse Enter para crear una etiqueta"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "No se encontraron etiquetas"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Etiquetas"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Estándar"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "No se ha encontrado la taxonomía. Por favor, compruebe la configuración de este campo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "La sugerencia o información a mostrar para este campo en el editor."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonomía"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Requerido"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Seleccionar al menos un elemento."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Único"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Si sólo un elemento puede ser seleccionado."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Solo Salir"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Las hojas son los únicos elementos que pueden ser seleccionados."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Si se pueden crear nuevas etiquetas en línea. Nota: Cuando se crean etiquetas en línea sólo se establecerá la propiedad del término de texto mostrado."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Tipo de contenido Término"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Agregar {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Ha reordenado la taxonomía."
diff --git a/Localization/es/OrchardCore.Templates.Cms.Module.po b/Localization/es/OrchardCore.Templates.Cms.Module.po
index 38b65730df8e8..b0c92bf200031 100644
--- a/Localization/es/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/es/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Mostrar"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/es/OrchardCore.Templates.po b/Localization/es/OrchardCore.Templates.po
index 41baccd25a290..1980167f27a96 100644
--- a/Localization/es/OrchardCore.Templates.po
+++ b/Localization/es/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Previsualizar"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "El Nombre de la Plantilla."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "La descripción de la plantilla."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Previsualizar"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "El Nombre de la Plantilla."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "La descripción de la plantilla."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/es/OrchardCore.Tenants.po b/Localization/es/OrchardCore.Tenants.po
index 075c6cd12cd9c..48139bfd375cd 100644
--- a/Localization/es/OrchardCore.Tenants.po
+++ b/Localization/es/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "No se puede deshabilitar el tenant por defecto."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "El tenant '{0}' ya está deshabilitado."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "El tenant '{0}' ya está habilitado."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Sólo puede activar un tenant deshabilitado."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Tenant no encontrado: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "El tenant no puede ser configurado."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "El proveedor de base de datos no está definido."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "La cadena de conexión es necesaria para este proveedor de base de datos."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Se requiere la \"Receta\" o el \"Nombre de la receta\"."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Receta '{0}' no encontrada."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Crear Tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Editar Tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Diseño"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/es/OrchardCore.Tests.po b/Localization/es/OrchardCore.Tests.po
index 30e8bf6b2ea63..49d5903148bc9 100644
--- a/Localization/es/OrchardCore.Tests.po
+++ b/Localization/es/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/es/OrchardCore.Themes.po b/Localization/es/OrchardCore.Themes.po
index 8a02b09cb968d..99831cbde3c89 100644
--- a/Localization/es/OrchardCore.Themes.po
+++ b/Localization/es/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exporta el tema del sitio seleccionado y el tema de administrador."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/es/OrchardCore.Title.po b/Localization/es/OrchardCore.Title.po
index 0f3e7988f9078..e05afd7a3dc98 100644
--- a/Localization/es/OrchardCore.Title.po
+++ b/Localization/es/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/es/OrchardCore.Twitter.po b/Localization/es/OrchardCore.Twitter.po
index 2d3474a06e677..3c8462344a92d 100644
--- a/Localization/es/OrchardCore.Twitter.po
+++ b/Localization/es/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Actualizar tarea de estado de Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Error"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "El inquilino actual se recargará cuando se guarden los ajustes."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Configuración de integración con Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Clave API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "La clave de la API definida en la pestaña Claves y tokens del panel de control de la aplicación de twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Clave secreta API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "La clave de la API definida en la pestaña Claves y tokens del panel de control de la aplicación de twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Token de acceso"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "El token de acceso definido en la pestaña Llaves y tokens del panel de control de la aplicación de twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Token de acceso secreto"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "El token de acceso definido en la pestaña Llaves y tokens del panel de control de la aplicación de twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Iniciar sesión con ajustes de Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Actualizar estado de Twitter"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/es/OrchardCore.Users.Core.po b/Localization/es/OrchardCore.Users.Core.po
index 5816688f6b6c0..b2202a22b8777 100644
--- a/Localization/es/OrchardCore.Users.Core.po
+++ b/Localization/es/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "El correo '{0}' no es válido."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Error inesperado: '{0}'."
diff --git a/Localization/es/OrchardCore.Users.po b/Localization/es/OrchardCore.Users.po
index e0314df62d86f..c7e79a50f5163 100644
--- a/Localization/es/OrchardCore.Users.po
+++ b/Localization/es/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Usuario creado correctamente"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Inicio de sesión local está deshabilitado."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "La cuenta está bloqueada"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Intento de inicio de sesión inválido."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Se ha producido un error en el proveedor externo."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "El sitio no permite el registro de usuario."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Confirma tu cuenta"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "El usuario especificado no puede iniciar sesión."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Debes confirmar tu correo electrónico."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Todos los usuarios"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Usuarios habilitados"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Usuarios Deshabilitados"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nombre"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Aprobar"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Activar"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Desactivar"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Eliminar"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Todos los roles"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Autenticado (sin roles)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Usuario {0} aprobado con éxito."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Usuario {0} eliminado correctamente."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Usuario {0} deshabilitado correctamente."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Usuario {0} habilitado correctamente."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Usuario creado correctamente."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Usuario actualizado correctamente."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Usuario eliminado correctamente."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "No se pudo eliminar el usuario."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "La contraseña fue actualizada correctamente."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Usuario desbloqueado correctamente."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "No se pudo desbloquear el usuario."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Ajustes de inicio de sesión"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exporta la configuración de inicio de sesión."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Preferencias de correo"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exporta la configuración de cambio de correo electrónico."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Configuración de registro"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exporta la configuración del registro."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Restablecer ajustes de contraseña"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exporta la configuración de la contraseña restablecida."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "La nueva contraseña y la confirmación de contraseña no coinciden."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Asignar tareas de rol de usuario"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Usuario"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Fallo"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Registrar tarea de usuario"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Usuario"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "No válido"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "No hay servicio de correo electrónico disponible"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Evento actualizado de usuario"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Usuario"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Validar tarea de usuario"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anónimo"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Autenticado"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Rol"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Se requiere un valor para {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} al rol {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "El usuario a asignar. Con soporte Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Cambiar Contraseña"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Crear Usuario"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Editar contraseña"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Crear una cuenta."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "Correo electrónico"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Contraseña"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Enviar correo electrónico de confirmación"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Reestablecer la contraseña"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "Correo electrónico"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/es/OrchardCore.Widgets.po b/Localization/es/OrchardCore.Widgets.po
index f896bef6b7fc0..4d74f546fb40f 100644
--- a/Localization/es/OrchardCore.Widgets.po
+++ b/Localization/es/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Añadir Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Estándar"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/es/OrchardCore.Workflows.po b/Localization/es/OrchardCore.Workflows.po
index 607953e386a11..1778d8589559a 100644
--- a/Localization/es/OrchardCore.Workflows.po
+++ b/Localization/es/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-17 17:52\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Tarea de la transacción de commit"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Sesión"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Inválido"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Tarea de correspondencia"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Primitivas"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Por cada tarea"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Iterador"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Clonar Tarea"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Para repetir tarea"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Iterar"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Si otra tarea"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Verdadero"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Falso"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Unirse a la tarea"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Se ha unido"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Registrar tarea"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Primitivas"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Hecho"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Excepciones"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Notificar tarea"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Interfaz de Usuario"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Tarea de script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Establecer Tarea de Salida"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Primitivas"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Establecer tarea de propiedad"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Primitivas"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "En bucle de tareas"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Flujo de control"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Iterar"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Hecho"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Actividad actualizada con éxito."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Creado recientemente"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Menos recientemente creado"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Fallado"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Terminado"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Eliminar"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "El flujo de trabajo {0} ha sido eliminado."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Eliminar"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "El flujo de trabajo {0} ha sido eliminado."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "El flujo de trabajo ha sido guardado."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Flujo de trabajo {0} eliminado"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Tarea de redirección Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Hecho"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Evento de Solicitud Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Hecho"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Coincidido"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Tarea de solicitud Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Estado de Http no manejado"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Tarea de Respuesta Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Hecho"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "No autorizado a activar '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Tarea de inicio"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Editar"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Agregar"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Correlación"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Regresar"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "¿Está seguro que desea eliminar esta instancia de flujo de trabajo?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Eliminar"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "Avanzado"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Valor de expiración de bloqueo no válido en la pestaña avanzada"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "El tiempo de espera en milisegundos para adquirir un bloqueo antes de reanudar una instancia de flujo de trabajo de este tipo atómicamente. Déjalo a cero para no usar ningún bloqueo."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Eventos Disponibles"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Tareas disponibles"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "¿Está seguro de que desea eliminar esta actividad?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtro"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Avanzado"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Valor de expiración de bloqueo no válido en la pestaña avanzada"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "El tiempo de espera en milisegundos para adquirir un bloqueo antes de reanudar una instancia de flujo de trabajo de este tipo atómicamente. Déjalo a cero para no usar ningún bloqueo."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Iterar <em>{0}</em> sobre <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "La lista a iterar. Con soporte JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "No hay bifurcaciones"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Iterar <em>{0}</em> de <em>{1}</em> a <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "El valor de inicio. Con soporte JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "El valor final. Con soporte JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "El valor de paso del bucle. Con soporte JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Redirección HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "La URL para la redirección. Con soporte Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Permanente"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Compruebe si la redirección debe ser permanente (301). Deje sin marcar para una redirección temporal (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Manejar petición HTTP entrante"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Cualquiera que invoque esta URL activará este flujo de trabajo. Mantenerlo en un lugar seguro."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Validar Token Antifalsificación"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Desmarcar esta opción si la solicitud viene de un servicio que invoca esta URL como un webhook. Si esta URL es solicitada desde un formulario, entonces mantenga esta opción marcada para asegurar que los valores del formulario no se hayan modificado."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Vida de Token"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Pulsa el botón <b>Regenerar</b> después de cambiar este valor."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Número de días de expiración del token. 0 para que el token nunca expire"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Filtrar petición HTTP entrante"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "El método HTTP a coincidir."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "El nombre del controlador a coincidir."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "El nombre de acción a coincidir."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "La URL para enviar la petición. Soporta la sintaxis Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "El método HTTP. Por ejemplo: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "El tipo de contenido del cuerpo de la petición."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "El cuerpo a enviar con peticiones POST, PUT y PATCH. Con soporte Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Proporciona cabeceras HTTP adicionales, una por línea. Por ejemplo: Autorización: Bearer 123ABC. Con soporte Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "Respuesta HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "El código de estado HTTP para enviar de vuelta. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Haga clic aquí</a> para una lista completa."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "El tipo de contenido del cuerpo de respuesta."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "El cuerpo a enviar de vuelta. Con soporte Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Evaluar <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Ordenar"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "¿Está seguro que desea eliminar esta instancia de flujo de trabajo?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Eliminar"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Creado {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Nada aquí!</strong> No hay flujos de trabajo detenidos en este momento."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Regresar"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "seleccionado"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Desactivado"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 instancia"
-msgstr[1] "{0} instancias"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Espera a <strong>cualquier</strong> actividades entrantes antes de unirse a la ejecución en una sola ruta."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "El nivel de log."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} Notificación"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "El tipo de notificación."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Secuencia de comandos"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Una lista separada por comas de resultados disponibles."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Salida vía {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "El nombre para la salida."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Establecer Propiedad {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "La propiedad a establecer. Si la propiedad especificada no existe aún, se agregará."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Cuando <em>{0}</em> se activa"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "No se especifican acciones de usuario"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Introduzca uno o más nombres de acción separados por comas."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "El bucle Mientras <em>{0}</em> es verdadero"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Iterar mientras una condición es verdadera."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/es/TheAdmin.po b/Localization/es/TheAdmin.po
index 0ab68952721f6..3ad18cdc95f48 100644
--- a/Localization/es/TheAdmin.po
+++ b/Localization/es/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Modo claro"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Modo oscuro"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Visitar web"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Contraer / expandir menú"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Eliminar"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "¿Está seguro de que desea eliminar este elemento?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Aceptar"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/es/TheAgencyTheme.po b/Localization/es/TheAgencyTheme.po
index 3b9812d2cf121..0f768ce8b6237 100644
--- a/Localization/es/TheAgencyTheme.po
+++ b/Localization/es/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "No hay resultados."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Página no encontrada"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "La página solicitada no se pudo encontrar."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/es/TheBlogTheme.po b/Localization/es/TheBlogTheme.po
index a8e5073564073..62d43f44a4a42 100644
--- a/Localization/es/TheBlogTheme.po
+++ b/Localization/es/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-02-18 20:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "en {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "No hay resultados."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Página no encontrada"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/es/TheTheme.po b/Localization/es/TheTheme.po
index 8d079a9ecc160..56b1597d17e7e 100644
--- a/Localization/es/TheTheme.po
+++ b/Localization/es/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/fa/OrchardCore.Admin.po b/Localization/fa/OrchardCore.Admin.po
index 0459fb0dcde21..9764620d6e111 100644
--- a/Localization/fa/OrchardCore.Admin.po
+++ b/Localization/fa/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:39\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "مدیر سیستم"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "تنظیمات مدیر سیستم"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "گرفتن خروجی از تنظیمات جستجوی مدیر سیستم."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "به Orchard Core خوش آمدید"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "با خیال راحت منو را مرور کنید و تمام امکانات آن را کشف کنید."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "فعال سازی حالت شب برای تم مدیر سیستم"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "آیا می توان یک تم مدیر حالت تاریک نمایش داد یا خیر."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "عنوان ها در نوار بالا بتواند نمایش داده شود."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "مدیر سیستم"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/fa/OrchardCore.AdminDashboard.po b/Localization/fa/OrchardCore.AdminDashboard.po
index 460999385d827..7084bf3ea9d79 100644
--- a/Localization/fa/OrchardCore.AdminDashboard.po
+++ b/Localization/fa/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-20 11:46\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "خیر"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "موقعیت"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "عرض"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/fa/OrchardCore.AdminMenu.po b/Localization/fa/OrchardCore.AdminMenu.po
index 8ae132dd41e25..4a639af0dabb3 100644
--- a/Localization/fa/OrchardCore.AdminMenu.po
+++ b/Localization/fa/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "ایجاد منوی مدیریت {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "نام"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "ایجاد شاخه"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "ویرایش منوی مدیریت: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "ویرایش شاخه"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "اولویت لینک. زمانی که دو لینک به یک آدرس متصل می‌شوند، لینکی اکتیو نمایش داده می‌شود که اولویت بالاتری داشته باشد. لینکی که مقدار اولویت آن بالاتر است در نوار منوها به عنوان لینک اکتیو نمایش داده می‌شود."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "ترتیب قرارگیری این لینک در منوی مدیریت."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "لینک"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "متن لینک که در درخت نشان داده می‌شود."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "آدرس لینک. لینک زمانی نمایش داده می شود که خودش یا یکی از زیر مجموعه هایش دارای آدرس باشد. آدرس نسبی است و از روت سایت ادمین در نظر گرفته خواهد شد"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "یک آیکون را انتخاب کنید"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "پلازهولدر"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "متن آیتم منویی که در درخت نمایش داده می‌شود."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "انتخاب"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "انتخاب آیکون برای منو، زمانی که آیتم منو در سطح اول قرار دارد."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "یک آیکون را انتخاب کنید"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "مجوزها"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "برای جستجو تایپ کنید"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "انتخاب"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "موردی یافت نشد"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "مجوز مورد نیاز برای نمایش این آیتم منو (اختیاری)."
diff --git a/Localization/fa/OrchardCore.Alias.po b/Localization/fa/OrchardCore.Alias.po
index 3d1e29099b67f..7534ee2ac936c 100644
--- a/Localization/fa/OrchardCore.Alias.po
+++ b/Localization/fa/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "نام مستعار شما در حال حاضر در حال استفاده است. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "الگو حاوی یک عبارت Liquid معتبر نیست. جزئیات: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "خالی بگذارید تا دوباره تولید شود."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "نام مستعار ایجاد می شود و ورودی غیرفعال می شود"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fa/OrchardCore.ArchiveLater.po b/Localization/fa/OrchardCore.ArchiveLater.po
index 12f250fce31b1..9784473d4f691 100644
--- a/Localization/fa/OrchardCore.ArchiveLater.po
+++ b/Localization/fa/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-05-07 07:50\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "بایگانی در فرصتی دیگر"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "لغو بایگانی در فرصتی دیگر"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/fa/OrchardCore.AuditTrail.po b/Localization/fa/OrchardCore.AuditTrail.po
index 9d2b6f1bdd808..2f2f6ebc705d0 100644
--- a/Localization/fa/OrchardCore.AuditTrail.po
+++ b/Localization/fa/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "سابقه ممیزی"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "تمام دسته ها"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "محدوده زمان دلخواه"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "سابقه ممیزی"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "اگر وظیفه کوتاه سازی غیرفعال شده است."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "تعداد روزهایی که یک رویداد نگهداری می شود."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/fa/OrchardCore.Autoroute.po b/Localization/fa/OrchardCore.Autoroute.po
index 0250b33c2eb4a..cc223ac78fd60 100644
--- a/Localization/fa/OrchardCore.Autoroute.po
+++ b/Localization/fa/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "پیوند ثابت شما خیلی طولانی است. پیوند ثابت فقط می تواند حداکثر تا {0} کاراکتر باشد."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "غیرفعال کردن مسیر خودکار برای این آیتم محتوا را علامت بزنید."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "علامت بزنید تا مشخص کنید که یک آیتم محتوای فرزند به یک مسیر مطلق هدایت شود."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fa/OrchardCore.BackgroundTasks.po b/Localization/fa/OrchardCore.BackgroundTasks.po
index 1b884269ad0b6..d1703c121ab38 100644
--- a/Localization/fa/OrchardCore.BackgroundTasks.po
+++ b/Localization/fa/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "عنوان"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "شرح"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -116,7 +116,7 @@ msgstr "زمان‌بندی وظیفه به عنوان یک عبارت کرون
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:51
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Use Tenant Pipeline"
-msgstr ""
+msgstr "استفاده از پایپلاین مستاجر"
 
 #. <span class="hint">@T["Whether or not the tenant pipeline should be built to configure endpoints and then executed to allow route urls generation in the background."]</span>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:53
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "مقدار انقضای قفل در برگه پیشرفته نامعتبر است"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "اگر ویژگی قفل توزیع شده فعال نباشد، نادیده گرفته می شود."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/fa/OrchardCore.ContentFields.po b/Localization/fa/OrchardCore.ContentFields.po
index 3f98b9eab3ec1..b76984fdecb6a 100644
--- a/Localization/fa/OrchardCore.ContentFields.po
+++ b/Localization/fa/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-19 08:26\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "سوییچ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "هیج آیتم محتوایی یافت نشد."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "استاندارد"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "منتشر نشده"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "برای جستجو تایپ کنید"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "انتخاب"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "موردی یافت نشد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "امکان انتخاب چند اِلمان وجود داشته باشد."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "نمایش انواع محتوا"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "همه نوع محتوای این استریوتایپ ها"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "انواع محتوا جهت نمایش. حداقل یک مورد انتخاب شود."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "بومی‌سازی شده"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "ویرایشگر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "تنظیمات ویرایشگر را وارد نمایید. زبان پیشفرش هنگام ذخیره \"html\" است."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "مستندات تنظیمات"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "آیا نشانی اینترنتی هنگام انتخاب از Insert Media استفاده می‌شود یا نه (به طور پیش‌فرض، Shortcode درج می‌شود)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "مستندات تنظیمات"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "آدرس"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "متن لینک"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "وارد کردن آدرس ضروری باشد."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "استفاده از آدرس لینک"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "توضیحی در مورد آدرس که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "توضیحی در مورد متن لینک که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "توضیحی (از نوع پلازهولدر) که در صورت وارد نکردن آدرس نمایش داده می‌شود."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "توضیحی (از نوع پلازهولدر) که در صورت وارد نکردن متن نمایش داده می‌شود."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "یک آدرس معتبر که هنگام ساخت یک آیتم محتوا پیشنهاد می‌شود."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "هیج آیتم محتوایی یافت نشد."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "استاندارد"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "منتشر نشده"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "برای جستجو تایپ کنید"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "انتخاب"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "نتیجه‌ای یافت نشد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "امکان انتخاب چند اِلمان وجود داشته باشد."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "انواع محتوا جهت نمایش. حداقل یک مورد انتخاب شود."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "فهرست چک باکس"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "برای جستجو تایپ کنید"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "انتخاب"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "مقداری یافت نشد"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ", "
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "تعیین ضرروی بودن یک مقدار."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "ویرایش اطلاعات"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "یک فایل JSON که مقادیر مجاز را نشان می‌دهد، برای مثال {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "محدوده"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "اسپینر"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "توضیحی که در صورت وارد نکردن مقدار نمایش داده می‌شود. (اختیاری)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "تعداد رقم اعشار."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "کمترین مقداری که مجاز است. (اختیاری)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "بیشترین مقداری که مجاز است. (اختیاری)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "آدرس"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "H6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "تنظیمات ویرایشگر را وارد کنید."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "مستندات تنظیمات"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "ویرایش اطلاعات"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "یک فایل JSON که مقادیر مجاز را نشان می‌دهد، برای مثال {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr "مقدار پیش‌فرض. (اختیاری)"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "برای ثانیه از مقسوم علیه 60 استفاده کنید. '15'، برای ms یک اعشار برابر با تقسیم کننده 1000 بر 1000 است. '0.250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "بدون کاربر."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "استاندارد"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "غیرفعال"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "برای جستجو تایپ کنید"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "انتخاب"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "موردی یافت نشد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "امکان انتخاب چند اِلمان وجود داشته باشد."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "آیا به انتخابگر اجازه می‌دهد تا کاربران را از همه نقش‌ها نمایش دهد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "ضروری"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "راهنمایی"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی در مورد این فیلد که برای ویرایشگر آن نمایش داده می‌شود."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "عرض"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "عرض کادر ویدیو"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "ارتفاع"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "ارتفاع کادر ویدیو"
diff --git a/Localization/fa/OrchardCore.ContentLocalization.po b/Localization/fa/OrchardCore.ContentLocalization.po
index 9a6a4db67a445..eaf2f284b2ddf 100644
--- a/Localization/fa/OrchardCore.ContentLocalization.po
+++ b/Localization/fa/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-20 11:46\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "ایجاد نسخه بومی‌سازی شده این آیتم محتوا میسر نیست."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/fa/OrchardCore.ContentPreview.po b/Localization/fa/OrchardCore.ContentPreview.po
index 553d0e9071463..0dc5887b8eda3 100644
--- a/Localization/fa/OrchardCore.ContentPreview.po
+++ b/Localization/fa/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "الگو شامل عبارت Liquid معتبری نیست. توضیحات: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "امکان بروز رسانی پیش‌نمایش از بین رفت"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "خطا در هنگام نمایش پیش‌نمایش"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fa/OrchardCore.ContentTypes.po b/Localization/fa/OrchardCore.ContentTypes.po
index 0aa68da2416f7..acc4f411f1b2c 100644
--- a/Localization/fa/OrchardCore.ContentTypes.po
+++ b/Localization/fa/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "بخش‌های محتوا"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "نام نمایشی را وارد کنید."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "یک نوع محتوا با این نام نماشی وجود دارد."
@@ -66,10 +66,10 @@ msgstr "یک نوع محتوا با این نام نماشی وجود دارد."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "نام فنی را وارد کنید."
@@ -78,10 +78,10 @@ msgstr "نام فنی را وارد کنید."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "نام فنی باید با یک حرف شروع شود."
@@ -90,10 +90,10 @@ msgstr "نام فنی باید با یک حرف شروع شود."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "نام فنی شامل کاراکترهای غیرمجاز است."
@@ -101,133 +101,133 @@ msgstr "نام فنی شامل کاراکترهای غیرمجاز است."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "نام فنی برای استفاده داخلی محفوظ است."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "یک نوع محتوا با این نام فنی وجود دارد."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "محتوا از نوع \"{0}\" ایجاد شده است."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "تنظیمات \"{0}\" ذخیره شده است."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "'{0}' حذف شده است."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "بخش \"{0}\" اضافه شد."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "یک بخش محتوا با این نام نمایشی وجود دارد."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "یک بخش محتوا با این نام فنی وجود دارد."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "بخش \"{0}\" حذف شد."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "امکان ایجاد این بخش محتوا میسر نیست."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "بخش محتوایی از نوع \"{0}\" ایجاد شده است."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "تنظیمات \"{0}\" ذخیره شد."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "هیچ فیلدی وجود ندارد."
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "فیلدی با همین نام نمایشی وجود دارد."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "یک فیلد با این نام فنی وجود دارد."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "فیلد \"{0}\" اضافه شد."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "نام نمایشی به {0} تغییر کرد."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "تنظیمات فیلد \"{0}\" ذخیره شد."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "فیلد \"{0}\" حذف شد."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "تنظیمات بخش \"{0}\" ذخیره شد."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "نام نوع محتوا را وارد کنید."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "افزودن بخشی به نام '{0}' میسر نیست. بخشی با این نام وجود دارد."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "اضافه‌کردن فیلد جدید به \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "نام این فیلد برای زمانی که این فیلد نمایش داده می‌شود."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "اضافه کردن یک بخش با عنوان به \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "نام این بخش (که قابلیت استفاده مجدد را دارد) برای زمانی که این بخش نمایش داده می‌شود."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "نام فنی این بخش (که قابلیت استفاده مجدد را دارد)."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "نوع محتوای خاص و تعاریف قسمت مشخص شده را برای به روز رسانی صادر می کند."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "نام فنی این بخش."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "نام این بخش برای زمانی که نمایش داده می‌شود. برای استفاده از پیش‌فرض‌ها خالی بماند."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "امکان چندین بار استفاده از این بخش در یک نوع محتوا میسر می‌شود."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "نام فنی این نوع."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "نام این نوع برای زمانی که نمایش داده می‌شود."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "نوع محتوای جدید"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "نام این نوع محتوا برای زمانی که این نوع محتوا نمایش داده می‌شود."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "بخش محتوای جدید"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "ایجاد"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "لیستی از تعاریف نوع محتوا که برای حذف با کاما جدا شده است"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "نوع محتوای خاص و تعاریف قسمت مشخص شده را برای حذف صادر می کند."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "ویرایش نوع محتوا - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "فیلدها"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "ویرایش"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "حذف"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "حالت نمایش"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "ویرایشگر"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "افزودن فیلد"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "بخش‌ها"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "فیلد‌های این نوع محتوا را در بر می‌گیرد"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "افزودن بخش‌ها"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "افزودن یک بخش با عنوان"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "ذخیره"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "پاک‌کردن"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "تنظیمات \"{0}\" برای \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "نام این فیلد برای زمانی که این فیلد نمایش داده می‌شود."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "نام فنی این فیلد."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "چه نوع ویرایشگری استفاده شود؟"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "چه نوع حالت نمایشی استفاده شود؟"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "ذخیره"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "انصراف"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "مشترکات چند بخش را می توان به عنوان یک <a href=\"{0}\">بخش جداگانه</a> تعریف کرد."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "نام این بخش برای زمانی که این بخش نمایش داده می‌شود."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "توضیحات این بخش برای زمانی که این بخش نمایش داده می‌شود."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "چه نوع ویرایشگری استفاده شود؟"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "چه نوع حالت نمایشی استفاده شود؟"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "ذخیره"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "انصراف"
diff --git a/Localization/fa/OrchardCore.Contents.po b/Localization/fa/OrchardCore.Contents.po
index 010e89fdd62e9..0e1646c04e08c 100644
--- a/Localization/fa/OrchardCore.Contents.po
+++ b/Localization/fa/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "لغوانتشار {0} انجام شد."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "همه انواع محتوا"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "یک یا چند خطای اعتبار سنجی رخ داده است."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "تنظیمات دنباله حسابرسی محتوا را صادر می کند."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "محتوا"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "انجام شد"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "سابقه ممیزی"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "اینکه آیا نظر ردیابی حسابرسی هنگام ویرایش نشان داده می شود یا خیر."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "تاریخی که این آیتم محتوا ایجاد ویا برای بار اول منتشر شده است."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "امکان ویرایش ایجاد کننده آیتم محتوا میسر باشد. برای استفاده از این امکان، داشتن دسترسی <code>SiteOwner</code> ضروری است."
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "لغو"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "و ادامه"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "عملیات"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "محتوا"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "پیش نویس ذخیره شده است."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "آیتم محتوا"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "نمایش انواع محتوا"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "یک آیکون را انتخاب کنید"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "نمایش انواع محتوا"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "تعداد محتوا را برای ارائه از ابن منبع محدود کنید. توجه: با انتخاب این گزینه فقط یک نوع محتوا قابل انتخاب است."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "فرکانس پیش‌فرض که احتمالاً این نوع محتوا با آن تغییر می‌کند."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "هر نوع محتوا"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "ایجاد محتوای جدید"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "در صورتی که می‌خواهید محتوا بلافاصله بعد از ایجاد منتشر شود، این گزینه انتخاب شود. در غیر این صورت نسخه پیش‌نویس محتوا ایجاد خواهد شد."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "حذف کردن محتوا با استفاده از expression روبرو: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "مشاهده پیش نویس با فرمت JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "دانلود پیش نویس با فرمت JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "مشاهده انتشار یافته با فرمت JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "دانلود انتشار یافته با فرمت JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "مشاهده با فرمت JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "هیچ محتوای صادراتی به طرح‌های هدف استقرار یافت نشد. یک طرح استقرار ایجاد کنید و یک محتوای صادراتی به مرحله هدف استقرار به آن اضافه کنید."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "محتوا"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "جدید"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "انتشار محتوا با استفاده از expression روبرو: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "بازیافتن محتوا با استفاده از expression روبرو: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "لغوانتشار محتوا با استفاده از expression روبرو: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "به روزرسانی محتوا با استفاده از expression روبرو: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "یک عبارت جاوا اسکریپت را وارد کنید که به شناسه مورد محتوا (ContentItemId) برای به‌روزرسانی ارزیابی می‌شود. به عنوان مثال: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/fa/OrchardCore.CustomSettings.po b/Localization/fa/OrchardCore.CustomSettings.po
index fbbf0ffecdbb5..43cc167bfec39 100644
--- a/Localization/fa/OrchardCore.CustomSettings.po
+++ b/Localization/fa/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "تنظیمات سفارشی‌سازی شده"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/fa/OrchardCore.Data.YesSql.po b/Localization/fa/OrchardCore.Data.YesSql.po
index 981d7e60b2198..1286bbb5fa46b 100644
--- a/Localization/fa/OrchardCore.Data.YesSql.po
+++ b/Localization/fa/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "جداول حذف نشد."
diff --git a/Localization/fa/OrchardCore.Demo.po b/Localization/fa/OrchardCore.Demo.po
index 69dc94a161cc2..87ca919a051b9 100644
--- a/Localization/fa/OrchardCore.Demo.po
+++ b/Localization/fa/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr "MMMM dd, yyyy"
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "نام کوچک"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "نام خانوادگی"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/fa/OrchardCore.Deployment.Remote.po b/Localization/fa/OrchardCore.Deployment.Remote.po
index be81e507c6292..5b4c031291dae 100644
--- a/Localization/fa/OrchardCore.Deployment.Remote.po
+++ b/Localization/fa/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "برنامه استقرار را به یکی از موارد ریموت ارسال می‌کند."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "نام سرویس‌گیرنده"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "ایجاد مورد ریموت"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "آدرس"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "نام سرویس‌گیرنده"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "ویرایش سرویس‌گیرنده ریموت"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "نام سرویس‌گیرنده"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "ویرایش مورد ریموت"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "آدرس"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "نام کِلایِنت"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/fa/OrchardCore.Deployment.po b/Localization/fa/OrchardCore.Deployment.po
index 10a33939f66d2..e6b63f1a2cc7e 100644
--- a/Localization/fa/OrchardCore.Deployment.po
+++ b/Localization/fa/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "وارد کردن JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "حذف"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "پلن های استقرار با موفقیت حذف شدند."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "نام اجباری است."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "الگویی با همین نام از قبل وجود دارد."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "برنامه استقرار با موفقیت به‌روزرسانی شد."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "برنامه استقرار با موفقیت پاک شد."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "ایجاد برنامه استقرار"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "افزودن فایل سفارشی‌سازی‌شده به عنوان بخشی از برنامه استقرار."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "نام فایل وقتی که به آرشیو اضافه می‌شود."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "برنامه‌های استقرار"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "ویرایش برنامه استقرار"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "دستورالعمل JSON"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "فایل دستورالعمل برای اضافه کردن به عنوان بخشی از طرح."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "نام فایل دستورالعمل."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "نام نمایشی Recipe."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "توضیحات دستورالعمل."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "نویسنده دستورالعمل."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "وبسایت دستورالعمل."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "ورژن دستورالعمل."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "دسته های دستورالعمل (مقادیر جدا شده با کاما)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/fa/OrchardCore.Diagnostics.po b/Localization/fa/OrchardCore.Diagnostics.po
index 327eac572e7fc..e22e53f14177e 100644
--- a/Localization/fa/OrchardCore.Diagnostics.po
+++ b/Localization/fa/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "مرورگر شما درخواستی ارسال کرد که این سرور قادر به درک آن نبود."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "خطایی هنگام اجرای این درخواست رخ داد."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "شما به این منبع دسترسی ندارید."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "صفحه مورد نظر یافت نشد."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "شما مجاز به مشاهده این محتوا نیستید."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/fa/OrchardCore.Email.Abstractions.po b/Localization/fa/OrchardCore.Email.Abstractions.po
index b67e0706b6ae9..258ac8d986eca 100644
--- a/Localization/fa/OrchardCore.Email.Abstractions.po
+++ b/Localization/fa/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2022-03-05 10:53\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "فیلد {0} ضروری است."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "روش ارسال {0} پشتیبانی نمی‌شود."
diff --git a/Localization/fa/OrchardCore.Email.po b/Localization/fa/OrchardCore.Email.po
index 9a83ee71d3356..7006d9eba1e6a 100644
--- a/Localization/fa/OrchardCore.Email.po
+++ b/Localization/fa/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:39\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "ایمیل نامعتبر."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "وظیفه ایمیل"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "ارسال پیام"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "ناموفق"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "ارسال پست الکترونیک"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "آدرس ایمیل نویسنده که مشخص می کند ایمیل از چه کسی است. برای استفاده از آدرس ایمیل پیکربندی شده، آن را خالی بگذارید. با پشتیبانی از Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "آدرس ایمیل فرستنده. اگر مشابه آدرس ایمیل \"از\" نباشد، الزامی است. با پشتیبانی از Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "\"پاسخ به\" آدرس ایمیل. اگر می‌خواهید پاسخ‌های ایمیل به آدرسی متفاوت از آدرس «از» ارسال شود، الزامی است. با پشتیبانی از Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "کاما(،) لیست آدرس های ایمیل های دریافت شده را جدا می‌کند. با پشتیبانی Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "فهرست آدرس‌های ایمیل کپی کربنی جدا شده با کاما. با پشتیبانی از Liquid."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "فهرست آدرس‌های ایمیل کپی کور جدا شده با کاما. با پشتیبانی از Liquid."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "اگر علامت زده شود، نشان می دهد که متن پیام ایمیل به صورت HTML ارسال می شود."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "تنظیمات"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "به"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "فرستنده اختیاری است، زمانی مفید است که نویسنده ایمیل با ارسال کننده ایمیل متفاوت باشد."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "رونوشت پنهان به"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "رونوشت به"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "پاسخ به"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "موضوع"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "بدنه (Body)"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "پس از ذخیره تنظیمات، tenant جاری، مجدد بارگذاری خواهد شد."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "آدرس ایمیل پیش فرض برای استفاده به عنوان فرستنده، مگر اینکه فرستنده ایمیل تنظیم شده باشد."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "تنظیمات روش ارسال شبکه‌"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "دامنه سرور SMTP ،برای مثال <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "پورت سرور SMTP ،به طور معمول 25 است."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "سرور پروکسی اختیاری است."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "پورت پروکسی اختیاری است."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "وقتی این گزینه انتخاب شده باشد، از هویت application pool یا شناسایی فرایند میزبان برای احرازهویت در سرور ایمیل استفاده می شود."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "نام کاربری برای احرازهویت."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "تنظیمات روش ارسال پوشه پیکاپ انتخاب شده"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "برای مثال در آدرس <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> پوشه <i>PickedUpEmail</i> در درایو C برای قرارگیری ایمیل ها استفاده می شود."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/fa/OrchardCore.Facebook.po b/Localization/fa/OrchardCore.Facebook.po
index 98408d27083f4..693cfd6dcdffc 100644
--- a/Localization/fa/OrchardCore.Facebook.po
+++ b/Localization/fa/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Facebook Body شامل عبارت Liquid معتبری نیست. جزئیات: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Body شامل عبارت Liquid معتبری نیست. جزئیات: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "تنظیمات ورود به سامانه"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "مسیر درخواست به همراه مسیر پایه (base path) برنامه‌کاربردی، جایی که user agent برگردانده می‌شود. این درخواست هنگام ورود، توسط middleware پردازش خواهد شد."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr "<a href=\"{0}\">تنظیمات Meta Integration</a> برای استفاده از ویژگی ورود باید پیکربندی شود"
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr "Pixel ID موجود در پورتال Meta Data Sources."
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "قالب افزونه، در فرمت Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr "ادغام Meta"
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr "شناسه برنامه موجود در پارامترهای پورتال توسعه دهنده متا."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr "کلید مخفی برنامه موجود در پارامترهای پورتال توسعه دهنده متا."
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "نسخه Javascript SDK"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "در هر صفحه‌ای Init فراخوانی شود"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/fa/OrchardCore.Features.po b/Localization/fa/OrchardCore.Features.po
index cb6347cc1282e..5e3b46c38adbf 100644
--- a/Localization/fa/OrchardCore.Features.po
+++ b/Localization/fa/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "امکانات"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "لطفا یک یا چند امکان را انتخاب نمایید."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "این ویژگی همیشه فعال است و نمی توان آن را غیرفعال کرد."
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} {1} بود."
@@ -125,9 +125,9 @@ msgstr "عملیات‌های گروهی"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "غیرفعال‌کردن"
@@ -136,8 +136,8 @@ msgstr "غیرفعال‌کردن"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "فعال‌کردن"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "دسته‌بندی‌نشده"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "این ویژگی به طور خودکار بر اساس وابستگی فعال می شود و نمی توان آن را به صورت دستی غیرفعال کرد."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "این ویژگی به طور خودکار بر اساس وابستگی غیر فعال شده است و نمی توان آن را به صورت دستی فعال کرد."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "این ویژگی همیشه فعال است و نمی توان آن را به صورت دستی غیرفعال کرد."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "غیرفعال کردن ویژگی {0} ویژگی‌های وابسته زیر را نیز غیرفعال می‌کند:{1}ادامه می‌دهید?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "غیرفعال‌کردن ویژگی"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "بله"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "خیر"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>اینجا چیزی نیست!</strong> جستجوی شما نتیجه ای نداشت."
diff --git a/Localization/fa/OrchardCore.Flows.po b/Localization/fa/OrchardCore.Flows.po
index eb2fa8d5fe0e2..38ee0add0adc9 100644
--- a/Localization/fa/OrchardCore.Flows.po
+++ b/Localization/fa/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:39\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr "مورد محتوای ویجت با شناسه {0} هیچ تعریفی مطابق با {1} نوع محتوا ندارد."
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "افزودن آیتم"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "انواع محتوایی که این bag می‌تواند شامل شود برای مثال Slide برای Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr "کلیشه های انواع محتوایی که این زمینه می تواند داشته باشد. شما می توانید چندین کلیشه را با استفاده از کاما (،) به عنوان جداکننده تعریف کنید"
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "درج ابزارک"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "پاک‌کردن"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "آیا از حذف این آیتم اطمینان دارید؟"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "هیچ ابزارکی یافت نشد."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/fa/OrchardCore.Forms.po b/Localization/fa/OrchardCore.Forms.po
index 5ddfcace4ceb0..b328418335056 100644
--- a/Localization/fa/OrchardCore.Forms.po
+++ b/Localization/fa/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "تنظیمات در فرمت نادرستی نوشته شده‌اند."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "وظیفه افزودن خطای اعتبارسنجی"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "اعتبارسنجی"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "وظیفه منطبق‌سازی Model State"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "اعتبارسنجی"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "وظیفه اعتبارسنجی Antiforgery Token"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "اعتبارسنجی"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "معتبر"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "نامعتبر"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "وظیفه اعتبارسنجی فیلد‌های فرم"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "اعتبارسنجی"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "معتبر"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "نامعتبر"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "وظیفه اعتبارسنجی فرم"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "اعتبارسنجی"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "معتبر"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "نامعتبر"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr "<em>{0}</em>: <em>{1}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "نام فیلدِ فرمی که مقدار نامعتبری دارد."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "فیلدهای فرم ثبت‌شده را با model state انطباق می‌دهد."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "متنی که در دکمه نمایش داده می‌شود."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "نوع دکمه."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr "نوع برچسبی که برای این فیلد ایجاد می شود."
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr "متن داخل برچسب."
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "شناسه‌‌‌ای (ID) که برای این المان فرم در نظر گرفته می‌شود."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr "نوع اعتبارسنجی که برای این فیلد ایجاد می شود."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "نامی (name) که برای این المان فرم در نظر گرفته می‌شود."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "آدرسی که فرم جهت ثبت به آن ارسال می‌شود."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "متود HTTP، که در هنگام ثبت فرم از آن استفاده می‌شود."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "علامت بزنید تا Anti Forgery Token در فرم ایجاد شود."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "نوع دکمه."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "متنی که قبل از وارد کردن مقدار این فیلد، نمایش داده می‌شود."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "مقدار پیش‌فرض برای این فیلد."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "ویرایش اطلاعات"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "یک فایل JSON که مقادیر مجاز را نشان می‌دهد، برای مثال {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr "سبک ویرایشگر برای استفاده در این زمینه."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "متنی که قبل از وارد کردن مقدار این textarea، نمایش داده می‌شود."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "اعتبارسنجی <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "نام (name) این فیلد فرم برای اعتبارسنجی."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "بررسی می‌کند که فرم ثبت‌شده دارای خطاهای اعتبار سنجی است یا خیر."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/fa/OrchardCore.GitHub.po b/Localization/fa/OrchardCore.GitHub.po
index 53620cbc2aeba..0a8949b014efe 100644
--- a/Localization/fa/OrchardCore.GitHub.po
+++ b/Localization/fa/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "تنظیمات احرازهویت GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "شناسه سرویس‌گیرنده در تب تنظیمات عمومی <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a> شما، تعریف شده است."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "کلید مخفی مشخص‌شده برای برنامه‌کاربردی شما."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/fa/OrchardCore.Google.po b/Localization/fa/OrchardCore.Google.po
index 46a244fe9884b..7a9be3783b7e9 100644
--- a/Localization/fa/OrchardCore.Google.po
+++ b/Localization/fa/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "تنظیمات گوگل آنالیتیکس"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "تنظیمات احرازهویت گوگل"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "شناسه سرویس‌گیرنده در کنسول Google API مربوط به این برنامه‌کاربردی تعریف شده است."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "کلید مخفی سرویس‌گیرنده در کنسول Google API مربوط به این برنامه‌کاربردی تعریف شده است."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr "تنظیمات گوگل تگ منیجر"
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/fa/OrchardCore.Html.po b/Localization/fa/OrchardCore.Html.po
index f92b3e73fa759..5c9f37658b360 100644
--- a/Localization/fa/OrchardCore.Html.po
+++ b/Localization/fa/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "ویرایشگر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "بدنه (Body) آیتم محتوا."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "گزینه های ویرایشگر را وارد کنید، زبان همیشه هنگام ذخیره روی \"html\" تنظیم می شود."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "مستندات تنظیمات"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "آیا نشانی اینترنتی هنگام انتخاب از Insert Media استفاده می‌شود یا نه (به طور پیش‌فرض، Shortcode درج می‌شود)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "تنظیمات ویرایشگر را وارد کنید"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "مستندات تنظیمات"
diff --git a/Localization/fa/OrchardCore.Https.po b/Localization/fa/OrchardCore.Https.po
index e1219f463e1c7..d0a4c3f1b4cdd 100644
--- a/Localization/fa/OrchardCore.Https.po
+++ b/Localization/fa/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "مشخص می کند که تغییر مسیر به HTTPS، به جای تغییر مسیر موقتی (307 - Found)، تغییر مسیر دائمی باشد (308 - Moved Permanently)"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/fa/OrchardCore.Infrastructure.Abstractions.po b/Localization/fa/OrchardCore.Infrastructure.Abstractions.po
index f240cd9b96bfd..a74dc7e996785 100644
--- a/Localization/fa/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/fa/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2022-05-18 11:19\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "سوئیچ \"{0}\" یافت نشد"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "ویژگی \"{0}\" وجود دارد اما با \"{1}\" decorate نشده است"
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "خطا در تبدیل {0} به {1} برای سوئیچ {2}"
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "آرگومان {0} با تعریف فرمان همخوانی ندارد"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "روش \"{0}\" از سوئیچ \"{1}\" پشتیبانی نمی کند."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/fa/OrchardCore.Layers.po b/Localization/fa/OrchardCore.Layers.po
index 3189fff72cf70..6baa3041af19c 100644
--- a/Localization/fa/OrchardCore.Layers.po
+++ b/Localization/fa/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "ایجاد لایه"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "توضیحات"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "ویرایش لایه - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "خطا در به‌روزرسانی ترتیب قانون"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "ذخیره"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "ویرایش ابزارک‌ها و لایه‌ها"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "ابزارک با موفقیت جابه‌جا شد.<a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>بازگشت به قبل</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "نواحی"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "لطفاً قبل از افزودن ابزارک، <a href=\"{0}\">مناطق موجود را تعریف کنید</a>"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "افزودنِ ابزارک"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "هیچ ابزارکی یافت نشد."
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "هیچ لایه ای یافت نشد."
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "لایه‌ها"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "لایه مورد نظر را برای آشکار شدن ابزارک‌های موجود در آن، انتخاب کنید."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "مستندات را ببینید"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "ویرایش"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "پاک‌کردن"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "لطفا قبل از افزودن ابزارک <a href=\"{0}\">یک لایه ایجاد کنید</a>"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "افزودن"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "عنوان با ابزارک نمایش داده شود."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "لایه‌ای که ابزارک در آن قرار می‌گیرد."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/fa/OrchardCore.Liquid.po b/Localization/fa/OrchardCore.Liquid.po
index c4b444eaab0f7..83887da07bcb8 100644
--- a/Localization/fa/OrchardCore.Liquid.po
+++ b/Localization/fa/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "بدنه Liquid حاوی یک عبارت Liquid معتبر نیست. جزئیات: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/fa/OrchardCore.Lists.po b/Localization/fa/OrchardCore.Lists.po
index 335e6f3129942..b9f44adcf8bb4 100644
--- a/Localization/fa/OrchardCore.Lists.po
+++ b/Localization/fa/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "یک لینک به آیتم محتوای والد و رتبه قرارگیری آن در هنگام نمایش در لیست را ارائه می‌دهد."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "مجموعه‌ای از آیتم‌های محتوا را ارائه می‌دهد."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "پست بلاگ مورد نظر دیگر وجود ندارد. لطفا یک پست بلاگ جدید بسازید."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "پاک‌کردن این محتوا مجاز نیست"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "نام کاربری، ایمیل و یا رمزعبور ارائه شده نادرست است."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "لیست مورد نظر خالی است"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "غیرفعال سازی تولید کننده لینک RSS feed."
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Feed فعلی توسط این آدرس <a href=\"{0}\" target=\"_blank\">{0}</a> در دسترس است."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "جدید"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "برای مرتب سازی دستی آیتم ها، این گزینه را علامت بزنید."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "لیست‌ها"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "افزودن آیتم منوی اصلی"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/fa/OrchardCore.Localization.po b/Localization/fa/OrchardCore.Localization.po
index 43961b211dacc..1ec465aa4f95e 100644
--- a/Localization/fa/OrchardCore.Localization.po
+++ b/Localization/fa/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "فرهنگ‌ها"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "انتخاب یک فرهنگ ضروری است"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "سایت برای اعمال تنظیمات مجددا راه اندازی شده است."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "فرهنگ‌های فعال پیکربندی‌شده برای سایت."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "تنظیمات فرهنگ"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "تنظیمات فرهنگ را صادر می کند."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "افزودن فرهنگ"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/fa/OrchardCore.Markdown.po b/Localization/fa/OrchardCore.Markdown.po
index 66181bda3b30c..2315cd762ea62 100644
--- a/Localization/fa/OrchardCore.Markdown.po
+++ b/Localization/fa/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} حاوی یک عبارت Liquid معتبر نیست. جزئیات: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "ویرایشگر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "بدنه (Body) آیتم محتوا، در فرمت Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "ویرایشگر Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fa/OrchardCore.Media.po b/Localization/fa/OrchardCore.Media.po
index 2099d4d4a8fff..18d5978b060ba 100644
--- a/Localization/fa/OrchardCore.Media.po
+++ b/Localization/fa/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "امکان جابه‌جایی فایل به دلیل وجود فایلی هم نام، میسر نیست"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "پروفایلی با همین نام وجود دارد."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "پروفایل با موفقیت حذف شد."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "پروفایل ها با موفقیت حذف شدند."
@@ -181,95 +181,95 @@ msgstr "پروفایل ها با موفقیت حذف شدند."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "پیش فرض"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "اندازۀ دلخواه"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "پیش فرض (بیشینه)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "بیشینه"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "برش"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "پد"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "باکس پد"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "کمینه"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "کش آمدن تصویر"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: وجود خطا در هنگام پردازش فایل ها."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "همه‌ی اسناد و فایل‌های موجود درون پوشه انتخاب شده وهمچنین زیرپوشه‌های آن دریافت شود."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "ایجاد پروفایل"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "نام پروفایل."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "راهنمایی برای پروفایل رسانه."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "عرض تصویر پردازش شده را انتخاب کنید. یک مقدار پیش فرض به این معنی است که یک فرمان عرض اعمال نخواهد شد."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "ارتفاع تصویر پردازش شده را انتخاب کنید. یک مقدار پیش فرض به این معنی است که فرمان ارتفاع اعمال نخواهد شد."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "حالت تغییر اندازه را برای تصویر پردازش شده انتخاب کنید."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "رنگ پس زمینه تصویر پردازش شده را انتخاب کنید. مقدار خالی به این معنی است که دستور bgcolor اعمال نخواهد شد. نمونه‌هایی از مقادیر معتبر: «white»، «ffff00»، «ffff0080»، «128،64،32» و «128،64،32،80»."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "فرمت تصویر پردازش شده را انتخاب کنید. یک مقدار پیش فرض به این معنی است که دستور فرمت اعمال نخواهد شد."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "ویرایش نمایه رسانه"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "نام پروفایل."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "راهنمایی برای پروفایل رسانه."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "عرض تصویر پردازش شده را انتخاب کنید. یک مقدار پیش فرض به این معنی است که یک فرمان عرض اعمال نخواهد شد."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "ارتفاع تصویر پردازش شده را انتخاب کنید. یک مقدار پیش فرض به این معنی است که فرمان ارتفاع اعمال نخواهد شد."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "حالت تغییر اندازه را برای تصویر پردازش شده انتخاب کنید."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "رنگ پس زمینه تصویر پردازش شده را انتخاب کنید. مقدار خالی به این معنی است که دستور bgcolor اعمال نخواهد شد. نمونه‌هایی از مقادیر معتبر: «white»، «ffff00»، «ffff0080»، «128،64،039» و «128،64،32،80»."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "فرمت تصویر پردازش شده را انتخاب کنید. یک مقدار پیش فرض به این معنی است که دستور فرمت اعمال نخواهد شد."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "برعکس"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "ایجاد پوشه"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "تغییر نام آیتم"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "فایل"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "از همه فایل‌ها یا یک فایل خاص خروجی می‌گیرد."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " تامبنِیل‌های کوچک"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " تامبنِیل‌های بزرگ"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr "این فایل از حداکثر اندازه بارگذاری بیشتر است"
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr "بارگذاری ها(آپلود)"
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr "خطاها"
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr "پاک‌کردن خطاها"
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "ضمیمه"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " تامبنِیل‌های کوچک"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " تامبنِیل‌های بزرگ"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "انتخاب فایل"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "تایید"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "آیا انتخاب یک نقطه لنگر برای تغییر اندازه مجاز است یا خیر."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fa/OrchardCore.Menu.po b/Localization/fa/OrchardCore.Menu.po
index 0a59a5379cbee..f063edde59e52 100644
--- a/Localization/fa/OrchardCore.Menu.po
+++ b/Localization/fa/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-08 10:25\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "منو"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "آیتم منو با موفقیت پاک شد."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "انتشار این آیتم محتوا ممکن است محتوای ایجاد شده را پاک کند. هر گونه مشکل نوع محتوا را از قبل برطرف کنید."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "ویرایش {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "آدرس"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "مستندات را ببینید"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/fa/OrchardCore.Microsoft.Authentication.po b/Localization/fa/OrchardCore.Microsoft.Authentication.po
index 35610c3eb5fd5..6139cca2a491d 100644
--- a/Localization/fa/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/fa/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "تنظیمات مربوط به احرازهویت حساب‌کاربری Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "شناسه برنامه‌کاربردی، موجود در پارامترهای پورتال توسعه‌دهندگان Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "کلید رمز برنامه‌کاربردی، موجود در پارامترهای پورتال توسعه‌دهندگان Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/fa/OrchardCore.Navigation.po b/Localization/fa/OrchardCore.Navigation.po
index 7cca90a4288da..022cf972aca55 100644
--- a/Localization/fa/OrchardCore.Navigation.po
+++ b/Localization/fa/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ">>"
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ">"
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr "<"
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr "<<"
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr "..."
diff --git a/Localization/fa/OrchardCore.Notifications.po b/Localization/fa/OrchardCore.Notifications.po
index 50f1bf4a8d3bc..c4a3d5985ba72 100644
--- a/Localization/fa/OrchardCore.Notifications.po
+++ b/Localization/fa/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr "وظیفه مالک محتوا را اطلاع دهید"
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr "وظیفه کاربر را اطلاع دهید"
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "اعلان‌ها"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr "انجام شده"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr "ناموفق"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr "ناموفق: کاربری پیدا نشد"
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr "خوانده شده"
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr "خوانده نشده"
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr "اخیرا ایجاد شده است"
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr "قبلا ایجاد شده است"
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "به عنوان خوانده شده علامت بزن"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "به عنوان خوانده نشده علامت بزن"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr "حذف"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] "اعلان"
 msgstr[1] "اعلان ها"
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr "{0} {1} با موفقیت خوانده نشد."
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr "{0} {1} با موفقیت خوانده شد."
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr "{0} {1} با موفقیت حذف شد."
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr "به عنوان خوانده شده علامت بزن"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr "هیچ اعلانی یافت نشد."
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr "انتخاب شده"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "انتخاب همه"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] "1 مورد"
 msgstr[1] "{0} مورد"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr "موارد {0} تا {1}"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "حذف"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
-msgstr "به کاربر اطلاع بده"
+msgid "Notify Content Owner"
+msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "می توانید از Liquid syntax استفاده کنید."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "این متن اختیاری از HTML پشتیبانی نمی کند. می توانید از Liquid syntax استفاده کنید."
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,11 +378,11 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "در صورت علامت زدن، ارائه‌دهنده اعلان از بدنه HTML در صورت پشتیبانی از HTML، استفاده می‌کند."
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
-msgstr "به مالک اطلاع بده"
+msgid "Notify Content Owner"
+msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:2
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr "به کاربر اطلاع بده"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "می توانید از Liquid syntax استفاده کنید."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "این متن اختیاری بدنه متن از HTML پشتیبانی نمی کند. می توانید از Liquid syntax استفاده کنید."
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "در صورت علامت زدن، ارائه‌دهنده اعلان از بدنه HTML در صورت پشتیبانی از HTML، استفاده می‌کند."
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] "اعلان"
-msgstr[1] "اعلان ها"
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr "شما بیش از {0} خوانده نشده {1} دارید"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr "شما {0} خوانده نشده {1} دارید"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
-msgstr "هیچ اعلان خوانده نشده ای ندارید"
+msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
-msgstr "مرکز اطلاع رسانی"
+msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/fa/OrchardCore.OpenId.po b/Localization/fa/OrchardCore.OpenId.po
index d5c88b154208a..3251de1044e99 100644
--- a/Localization/fa/OrchardCore.OpenId.po
+++ b/Localization/fa/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "این نام در حال حاضر توسط اِسکوپ دیگری گرفته شده است."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "پیکربندی سرور OpenID با موفقیت به‌روزرسانی شد."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "پیکربندی اعتبار سنجی OpenID با موفقیت به‌روزرسانی شد."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "ایجاد یک برنامه‌کاربردی جدید"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "شناسه سرویس‌گیرنده"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "برنامه‌های‌کاربردی محرمانه در هنگام برقراری ارتباط با نقطات‌پایانی توکن و ابطال (the token and revocation endpoints)، باید کلید مخفی سرویس‌گیرنده‌ خود را ارسال کنند. این امر دریافت کد مجوز یا توکن تازه‌سازی را فقط برای سرویس‌گیرنده‌ای که مجاز به دریافت آن است، میسر می‌کند."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "جریان تازه‌سازی توکن مجاز باشد"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "نقطه‌پایانی خروج از سامانه (Logout) مجاز باشد"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr "قبل از فعال کردن این گزینه مطمئن شوید که اپلیکیشن کاربر و کتابخانه OAuth یا OIDC مورد استفاده از PKCE پشتیبانی می کنند."
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "ایجاد یک اِسکوپ جدید"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "توجه: مستاجر سرور همیشه در مخاطبان توکن دسترسی گنجانده می شود، حتی اگر هیچ محدوده ای درخواست نشود."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "ویرایش یک برنامه‌کاربردی"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "شناسه سرویس‌گیرنده"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "برنامه‌های‌کاربردی محرمانه در هنگام برقراری ارتباط با نقطات‌پایانی توکن و ابطال (the token and revocation endpoints)، باید کلید مخفی سرویس‌گیرنده‌ خود را ارسال کنند. این امر دریافت کد مجوز یا توکن تازه‌سازی را فقط برای سرویس‌گیرنده‌ای که مجاز به دریافت آن است، میسر می‌کند."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "کلید مخفی سرویس‌گیرنده"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "جریان تازه‌سازی توکن مجاز باشد"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr "قبل از فعال کردن این گزینه مطمئن شوید که کتابخانه کلاینت/مشتری از PKCE پشتیبانی می کند."
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "ویرایش یک اِسکوپ"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "توجه: مستاجر سرور همیشه در مخاطبان توکن دسترسی گنجانده می شود، حتی اگر هیچ محدوده ای درخواست نشود."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "پس از ذخیره تنظیمات، tenant جاری، مجدد بارگذاری خواهد شد."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "نام نمایشی IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "مجوز استفاده از برقراری تماس‌های OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "مسیر درخواست به همراه مسیر پایه (base path) برنامه‌کاربردی، جایی که user agent برگردانده می‌شود. این درخواست هنگام ورود، توسط middleware پردازش خواهد شد."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "مشاهده post_logout_redirect_uri از "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "Uri جایی که user agent بعد از خروج (sign out) برنامه‌کاربردی از سرویس ارائه‌دهنده هویت به آن تغییرمسیر می‌دهد. تغییرمسیر بعد از فراخوانی SignedOutCallbackPath اتفاق می‌افتد."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "جریان احرازهویت کد"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "مشاهده شود: "
@@ -1217,15 +1217,15 @@ msgstr "از پاسخی که نوع آن 'code' است، استفاده کن"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "مثال:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "از پاسخی که نوع آن 'code token' است، استفاده کن"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "جریان احرازهویت ضمنی"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "از پاسخی که نوع آن ''id_token' است، استفاده کن"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "از پاسخی که نوع آن 'id_token token' است، استفاده کن"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "حالت پاسخ"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "پیکربندی حالت پاسخ. مشاهده شود: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "کلید مخفی سرویس‌گیرنده"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "کلید مخفی سرویس‌گیرنده را تنظیم می‌کند."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr "نام پارامتر"
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr "مقدار"
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr "حذف پارامتر از لیست"
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr "یک پارامتر اضافه کنید"
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr "ویرایش اطلاعات"
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr "پارامترها"
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "یک فایل JSON که مقادیر مجاز را نشان می‌دهد، برای مثال {0}"
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "تایید"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr "پارامترهای پیشرفته"
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr "پارامترهای پیشرفته که می توانند با درخواست مجوز ارسال شوند."
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "همه این گزینه‌ها اختیاری و فقط برای کاربران پیشرفته هستند."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "آدرس پایه سرور هویت (این سایت). در صورت عدم ارائه، مقدار پیش‌فرض براساس میزبانی سایت به صورت خودکار محاسبه خواهد شد."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "محل گواهی‌نامه رمزگذاری را انتخاب کنید."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "محل ذخیره گواهی‌نامه رمزگذاری را انتخاب کنید."
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "جهت تنظیم ماژول OpenID Connect، شما باید به سرورتان یک گواهی‌نامه اضافه کنید."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "محل گواهی‌ امضا را انتخاب کنید."
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "محل ذخیره گواهی امضا را انتخاب کنید."
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "وقتی این گزینه فعال است، توکن های تازه‌سازی به‌عنوان بازخرید شده علامت‌گذاری نمی‌شوند و می‌توانند تا زمانی که منقضی شوند دوباره استفاده شوند."
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "پس از ذخیره تنظیمات، tenant جاری، مجدد بارگذاری خواهد شد."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "تِننت (tenant) سرور صدورمجوز"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "آدرس سرور ریموت OpenID Connect. استفاده از آدرسی که HTTPS دارد، به‌شدت توصیه می‌شود."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr "URI خوش فرم نقطه پایانی OpenID Connect Metadata Address. این فقط برای سناریوهای پیشرفته است که ابرداده از نقطه پایانی مرجع استاندارد در دسترس نیست. هنگام استفاده از مستاجر نمی توان از آن استفاده کرد و استفاده از آدرس HTTPS اکیداً توصیه می شود."
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/fa/OrchardCore.Placements.po b/Localization/fa/OrchardCore.Placements.po
index 3c3c8348ad746..a6858b99a13c5 100644
--- a/Localization/fa/OrchardCore.Placements.po
+++ b/Localization/fa/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "قوانین جایگذاری برای {0} از قبل وجود دارد. لطفا قانون موجود را ویرایش کنید."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "مکان \"{0}\" ذخیره شده است."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "جای \"{0}\" خالی است."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "مکان \"{0}\" حذف شده است."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "هنگام آنالیز مکان، خطایی روی داد<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "هنگام ذخیره مکان، خطایی روی داد."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "مکان ها با موفقیت حذف شدند."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "ویرایش مکان"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "نوع شکل."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/fa/OrchardCore.ProjectTemplates.po b/Localization/fa/OrchardCore.ProjectTemplates.po
index bb69ad315c25b..4ae2502871ef1 100644
--- a/Localization/fa/OrchardCore.ProjectTemplates.po
+++ b/Localization/fa/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "نمایش"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/fa/OrchardCore.PublishLater.po b/Localization/fa/OrchardCore.PublishLater.po
index eaf8a72588bef..ecc151f21b0cc 100644
--- a/Localization/fa/OrchardCore.PublishLater.po
+++ b/Localization/fa/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "انتشار در فرصتی دیگر"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "لغو انتشار در فرصتی دیگر"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/fa/OrchardCore.Queries.po b/Localization/fa/OrchardCore.Queries.po
index 2528526f62ae0..d00f231b36492 100644
--- a/Localization/fa/OrchardCore.Queries.po
+++ b/Localization/fa/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "اجرای کوئری SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "هنگام اجرای کوئری SQL خطایی روی داد: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "کوئری SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "کوئری‌ SQL از قوانین نحو تدوین‌شده برای استاندار SQL92 استفاده می‌کند و برای یک پایگاه‌داده واقعی تبدیل می‌شود. پیشوند به صورت خودکار به نام جداول اعمال می‌شود."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "کوئری"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "نام فنی این کوئری."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr "اگر علامت زده شود، باید به صورت دستی متغیرهایی را برای مراجع آیتم محتوا مانند فیلدهای انتخاب کننده محتوا، فیلدهای طبقه بندی، فیلدهای برچسب و شناسه آیتم فهرست اعلام کنید و در صورت نیاز در دستور العمل جایگزین کنید. هرگونه ارجاع به این موارد محتوا از بین خواهد رفت."
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr "توجه: Query باید برای بازگرداندن اسناد پیکربندی شود."
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "نتیجه لیستی از شناسه‌های اسناد باشد."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/fa/OrchardCore.ReCaptcha.Core.po b/Localization/fa/OrchardCore.ReCaptcha.Core.po
index 63eb1dafb396e..e63f85df95dcd 100644
--- a/Localization/fa/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/fa/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2021-07-15 19:00\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "اعتبارسنجی captcha انجام نشد"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "اعتبارسنجی captcha انجام نشد"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "زبانی به نام {0} پیدا نشد"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/fa/OrchardCore.ReCaptcha.po b/Localization/fa/OrchardCore.ReCaptcha.po
index b17dbb303d864..9cb78a4acd591 100644
--- a/Localization/fa/OrchardCore.ReCaptcha.po
+++ b/Localization/fa/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "تنظیمات ReCaptcha را صادر می کند."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "وظیفه اعتبارسنجی ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "اعتبارسنجی"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "معتبر"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "نامعتبر"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "اعتبارسنجی Captcha انجام نشد. دوباره تلاش کنید."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "با ذخیره تنظیمات، مستاجر فعلی دوباره بارگیری می شود."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "کلید سایت reCaptcha گوگل شما."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/fa/OrchardCore.Recipes.Core.po b/Localization/fa/OrchardCore.Recipes.Core.po
index 8eb455e3e5c3b..6d0aeb30ac13c 100644
--- a/Localization/fa/OrchardCore.Recipes.Core.po
+++ b/Localization/fa/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-08 13:20\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/fa/OrchardCore.Roles.po b/Localization/fa/OrchardCore.Roles.po
index 8f7a5165c2d9b..9f7bb776d9828 100644
--- a/Localization/fa/OrchardCore.Roles.po
+++ b/Localization/fa/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "نقش‌ها"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "نام نقش نامعتبر است."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "نقش با موفقیت به‌روزرسانی شد."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "نقش‌های سیستمی را نمی‌توان پاک کرد."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "ایجاد نقش"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "نام نقش"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "ویرایش جزئیات نقش"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "مجوز"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "این مجوز برای کاربر امکان بالابردن دسترسی‌های دیگرش را فراهم می‌کند. پس از انجام ملاحظات جدی این مجوز را اعطا کنید."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "انصراف"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "نقش‌ها"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/fa/OrchardCore.Rules.po b/Localization/fa/OrchardCore.Rules.po
index d5f4f325f89a7..1e0634d0b1b21 100644
--- a/Localization/fa/OrchardCore.Rules.po
+++ b/Localization/fa/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-10 06:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "همه"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "هر"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "افزودن"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "نوع محتوا"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "عملگر قانون را انتخاب کنید."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "فرهنگ"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "عملگر قانون را انتخاب کنید."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr "جاوا اسکریپت"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "نقش"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "عملگر قانون را انتخاب کنید."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr "آدرس"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "عملگر شرط را انتخاب کنید."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/fa/OrchardCore.Search.Elasticsearch.po b/Localization/fa/OrchardCore.Search.Elasticsearch.po
index f3c65dff4f28e..150170ae8f1d6 100644
--- a/Localization/fa/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/fa/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,127 +56,127 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr "Elasticsearch"
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr "بازنشانی"
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr "بازسازی"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr "حذف"
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr "فهرستی به نام {0} قبلا ایجاد شده است."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "فهرستی به نام {0} وجود ندارد."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "یک خطا هنگام ایجاد فهرست به وجود آمده است."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت ایجاد شد."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr "هنگام ویرایش نمایه خطایی روی داد."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
-msgstr "فهرست <em>{0}</em> با موفقیت اصلاح شد، <strong>لطفاً بازسازی نمایه را در نظر بگیرید.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
+msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت مجددا تنظیم شد."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت بازسازی شد."
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr "ایندکس در سرور Elasticsearch یافت نشد."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت پاک شد."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "یک خطا هنگام پاک‌کردن فهرست به وجود آمده است."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr "درخواست نامعتبر: {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr "شاخص ها با موفقیت حذف شدند."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
-msgstr "حداقل یک انتخاب نوع محتوا مورد نیاز است."
+msgid "At least one content type is required."
+msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr "نام فهرست ضروری است."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
-msgstr "نام فهرست شامل کارکترهای غیرمجاز است."
+msgid "The index name contains forbidden characters."
+msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
 #: OrchardCore.Search.Elasticsearch\Drivers\ElasticQueryDisplayDriver.cs:65
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr "فیلد فهرست ضروری است"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr "ویرایش فهرست Elasticsearch"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr "مستندات را ببینید"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr "یک تحلیلگر انتخاب کنید"
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr "فرهنگ محتوا که فهرست خواهد شد."
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr "انواع محتوا برای فهرست. حداقل یکی را انتخاب کنید."
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr "بازسازی شاخص های Elasticsearch"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr "اجرا"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr "برای بازگرداندن موارد محتوای مربوطه علامت بزنید."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,53 +572,53 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr "پرس و جو Elasticsearch"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
+msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
+msgstr ""
+
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
 msgid "Default search index"
 msgstr "فهرست جستجو پیش‌فرض"
 
 #. <span class="hint">@T["The default index to use for the search page."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
 msgid "The default index to use for the search page."
 msgstr "فهرست پیش‌فرض برای استفاده در صفحه جستجو."
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
-msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
-msgstr "جهت تنظیم فهرست جستجو به حداقل یک فهرست نیاز است."
-
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
-msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
-msgstr "فیلد های جستجو شده پیش‌فرض"
-
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
-msgstr "فهرستی از فیلدهای جدا شده با کاما برای استفاده برای صفحات جستجو. مقدار پیش فرض <code>Content.ContentItem.FullText</code> است."
+msgid "Default search type"
+msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
-msgstr "به Elasticsearch \"پرس و جو رشته پرس و جو\" در فرم های جستجو اجازه دهید"
+msgid "Default query"
+msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
-msgstr "آیا درخواست‌های جستجو باید مجاز به استفاده از <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query -string-query\">Elasticsearch نحو \"query string query\"</a>."
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
+msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
-msgstr "مستندات را ببینید"
+msgid "Default searched fields"
+msgstr "فیلد های جستجو شده پیش‌فرض"
+
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
+msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
+msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticSettingsDeploymentStep.Fields.Edit.cshtml:3
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr "نگاشت های شاخص Elasticsearch"
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr "پرس و جو Elasticsearch"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr "فهرست Elasticsearch برای جستجو"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr "عبارت جستجو از قالب Elasticsearch استفاده می کند. برخی از اسناد را می‌توانید در اینجا پیدا کنید <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/fa/OrchardCore.Search.Lucene.po b/Localization/fa/OrchardCore.Search.Lucene.po
index d170114e74079..5b16ce47c1210 100644
--- a/Localization/fa/OrchardCore.Search.Lucene.po
+++ b/Localization/fa/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr "Lucene"
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr "بازنشانی"
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr "بازسازی"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr "حذف"
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr "هر فرهنگ"
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr "فهرستی به نام {0} قبلا ایجاد شده است."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "فهرستی به نام {0} وجود ندارد."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "یک خطا هنگام ایجاد فهرست به وجود آمده است."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت ایجاد شد."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr "هنگام ویرایش نمایه خطایی روی داد."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr "فهرست <em>{0}</em> با موفقیت اصلاح شد، <strong>لطفاً بازسازی نمایه را در نظر بگیرید.</strong>"
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت مجددا تنظیم شد."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت بازسازی شد."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "فهرست <em>{0}</em> با موفقیت پاک شد."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "یک خطا هنگام پاک‌کردن فهرست به وجود آمده است."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr "درخواست نامعتبر: {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr "شاخص ها با موفقیت حذف شدند."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr "حداقل یک انتخاب نوع محتوا مورد نیاز است."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr "نام فهرست ضروری است."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr "نام فهرست شامل کارکترهای غیرمجاز است."
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr "Lucene"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr "ویرایش فهرست Lucene"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr "نام فهرست"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr "نام تحلیل گر"
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr "فرهنگ محتوا که فهرست خواهد شد."
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr "انواع محتوا برای نمایه سازی حداقل یکی را انتخاب کنید."
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr "شاخص های جستجوی Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr "شاخص های جستجوی لوسن را بازسازی کنید"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr "بازنشانی شاخص های جستجوی Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "همه"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr "اجرا"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr "برای بازگرداندن موارد محتوای مربوطه علامت بزنید."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr "کوئری Lucene"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr "جهت تنظیم فهرست جستجو به حداقل یک فهرست نیاز است."
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr "کوئری Lucene"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr "فهرست lucene برای جستجو"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr "عبارت جستجو از قالب Elasticsearch استفاده می کند. برخی از اسناد را می‌توانید در اینجا پیدا کنید <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr "ایجاد"
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr "نتایج نمایش داده شده از فیلدهای ذخیره شده در Lucene می آیند."
diff --git a/Localization/fa/OrchardCore.Search.po b/Localization/fa/OrchardCore.Search.po
index 7b439ec688c00..2c82b5c8922c1 100644
--- a/Localization/fa/OrchardCore.Search.po
+++ b/Localization/fa/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-20 11:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr "جستجو"
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr "متن جا نگهدار برای استفاده در نوار جستجو."
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr "برای استفاده از ایندکس پیش فرض، آن را خالی بگذارید."
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr "ارائه دهنده جستجوی پیش فرض برای استفاده در صفحه جستجو."
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/fa/OrchardCore.Security.po b/Localization/fa/OrchardCore.Security.po
index c52805f115359..3a7476d5f187f 100644
--- a/Localization/fa/OrchardCore.Security.po
+++ b/Localization/fa/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-17 12:02\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr "تنظیمات فعلی از منابع پیکربندی می‌آیند، ذخیره تنظیمات روی AdminSettings تأثیر می‌گذارد نه پیکربندی."
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr "به مدیران اجازه می دهد تا منابعی را که عامل کاربر مجاز به بارگیری برای یک صفحه معین است، کنترل کنند."
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr "به سایت اجازه می دهد تا کنترل کند که کدام ویژگی ها و API ها می توانند در مرورگر استفاده شوند."
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/fa/OrchardCore.Seo.po b/Localization/fa/OrchardCore.Seo.po
index 4bf28fbc5473d..800fc36ec87c5 100644
--- a/Localization/fa/OrchardCore.Seo.po
+++ b/Localization/fa/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr "یک قاعده اضافه کنید تا ربات‌های وب به مسیرهای مدیریت دسترسی نداشته باشند."
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "Metadata برای این صفحه ارائه شود یا خیر."
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr "عنوان صفحه مرورگر وب ایجاد شده پیش‌فرض را نادیده بگیرید (توصیه می‌شود کمتر از 70 کاراکتر باشد)."
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr "توضیحات meta ارائه شده برای این صفحه."
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr "کلیدواژه های meta برای ارائه برای این صفحه، با کاما از هم جدا شده اند."
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr "نشانی اینترنتی پیش‌فرض ابتدایی را لغو کنید."
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "ویرایش داده ها"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr "الگوی گوگل در تنظیمات Meta اجتماعی به طور پیش‌فرض استفاده می‌شود، یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr "نوع Open Graph در تنظیمات Meta اجتماعی به طور پیش‌فرض استفاده می‌شود، یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "عنوان به طور پیش‌فرض استفاده می‌شود، سپس عنوان صفحه، یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr "برای نمایش پانل الگوی گوگل علامت بزنید."
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "عنوان به طور پیش‌فرض استفاده می‌شود، سپس عنوان صفحه، یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr "توضیحات Meta به طور پیش‌فرض استفاده می‌شود یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr "کارت توییتر در تنظیمات متا اجتماعی به طور پیش‌فرض استفاده می‌شود، یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr "سازنده توییتر در تنظیمات متای اجتماعی به طور پیش‌فرض استفاده می‌شود، یا می‌توان آن را در اینجا لغو کرد."
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/fa/OrchardCore.Settings.po b/Localization/fa/OrchardCore.Settings.po
index b8a3027670bf9..912569b0b6691 100644
--- a/Localization/fa/OrchardCore.Settings.po
+++ b/Localization/fa/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "تنظیمات سایت با موفقیت به‌روزرسانی شد."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr "اندازه صفحه باید بزرگتر از صفر باشد."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr "اندازه صفحه باید کمتر یا مساوی با {0} باشد."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "URL پایه باید یک URL کاملا واجد شرایط باشد."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "تنظیمات سایت"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/fa/OrchardCore.Setup.Core.po b/Localization/fa/OrchardCore.Setup.Core.po
index b37cb3a8ced10..8e9fc29fff816 100644
--- a/Localization/fa/OrchardCore.Setup.Core.po
+++ b/Localization/fa/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr "تنظیم DatabaseProvider مورد نیاز است."
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr "ارائه دهنده پایگاه داده ارائه شده پشتیبانی نمی شود."
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "رشته اتصال ارائه شده نامعتبر است یا سرور غیر قابل دسترسی است."
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "پایگاه داده ارائه شده، پیشوند جدول و طرحواره در حال حاضر در حال استفاده هستند."
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/fa/OrchardCore.Setup.po b/Localization/fa/OrchardCore.Setup.po
index 3ae8716eb8aae..602a06b204612 100644
--- a/Localization/fa/OrchardCore.Setup.po
+++ b/Localization/fa/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "کلمه عبور باید حداقل {0} کارکتر داشته باشد."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "راه‌اندازی سایت بدون دستورالعمل ممکن نیست."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "این عنوان پیش‌فرض صفحات سایت می‌شود."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "دستورالعمل‌ها به شما اجازه می‌دهند که سایت را با ویژگی‌ها و تنظیمات از پیش‌پیکربندی‌شده تکمیلی، برای یک هدف خاص راه‌اندازی کنید."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "ناحیه زمانی پیش‌فرض که جهت نمایش و ویرایش تاریخ‌ها و زمان‌ها استفاده می‌شود را مشخص می‌کند."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "پایگاه داده ای که برای ذخیره تنظیمات سایت و محتویات آن استفاده می شود."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "اگر قصد استفاده مجدد از یک پایگاه داده برای چندین سایت را دارید، می توانید یک پیشوند جدول را مشخص کنید."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "نمایش/عدم نمایش رشته اتصال"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "کاربر ارشد دارای تمام دسترسی‌ها است و بهتر است تنها در زمان راه‌اندازی و بازیابی، از آن استفاده شود."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "نام کاربری"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "ایمیل وارد‌شده نامعتبر است."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "استحکام رمزعبور"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/fa/OrchardCore.Shortcodes.po b/Localization/fa/OrchardCore.Shortcodes.po
index e784081b95027..2f045ff702f8f 100644
--- a/Localization/fa/OrchardCore.Shortcodes.po
+++ b/Localization/fa/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "محتوای قالب الزامی است."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "این الگو حاوی یک عبارت Liquid معتبر نیست. جزئیات: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "الگوی کد کوتاه با موفقیت حذف شد."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "الگوهای کد کوتاه با موفقیت حذف شدند."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "ایجاد کد کوتاه"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "نام کد کوتاه."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "راهنمایی برای کد کوتاه."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "مثال استفاده از کد کوتاه."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "دسته بندی های این shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "مقدار پیش فرض shortcode هنگام انتخاب. پیش‌فرض [name] است."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "ویرایش Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "نام کد کوتاه."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "راهنمایی برای کد کوتاه."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "مثال استفاده از کد کوتاه."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "دسته بندی های این shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "مقدار پیش فرض shortcode هنگام انتخاب. پیش‌فرض [name] است."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/fa/OrchardCore.Sitemaps.po b/Localization/fa/OrchardCore.Sitemaps.po
index 436e3d9f832e0..8a7f8ef402ce1 100644
--- a/Localization/fa/OrchardCore.Sitemaps.po
+++ b/Localization/fa/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "ویژگی Base url تنظیمات سایت خالی است، اما برای ایجاد نقشه سایت مورد نیاز است."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "ویژگی Base url تنظیمات سایت خالی است، اما برای ایجاد نقشه سایت مورد نیاز است."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "برای غیرفعال کردن مسیریابی به فهرست نقشه سایت، علامت را بردارید."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr "مسیر سفارشی نقشه سایت"
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr "مسیری که باید به نقشه سایت اضافه شود. به عنوان مثال، مسیر/به/چیزی"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr "فرکانس پیش فرضی که احتمالاً این مسیر با آن تغییر می کند."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "ویژگی Base url تنظیمات سایت خالی است، اما برای ایجاد نقشه سایت مورد نیاز است."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "ویژگی Base url تنظیمات سایت خالی است، اما برای ایجاد نقشه سایت مورد نیاز است."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "نام"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "برای غیرفعال کردن مسیریابی به فهرست نقشه سایت، علامت را بردارید."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "برای حذف این آیتم محتوا از نقشه سایت، علامت بزنید."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "فرکانس این آیتم محتوا احتمالاً تغییر می کند."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/fa/OrchardCore.Sms.po b/Localization/fa/OrchardCore.Sms.po
index 5431f7decc1d8..4c5d39fab9851 100644
--- a/Localization/fa/OrchardCore.Sms.po
+++ b/Localization/fa/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/fa/OrchardCore.Spatial.po b/Localization/fa/OrchardCore.Spatial.po
index fc50b434ed5b6..5cac26806ff37 100644
--- a/Localization/fa/OrchardCore.Spatial.po
+++ b/Localization/fa/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-05-07 07:50\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr "فیلد {0} الزامی است."
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr "عرض جغرافیایی"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "ویرایشگر جزوه"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr "عرض جغرافیایی"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "وارد کردن مقدار ضروری باشد."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fa/OrchardCore.Taxonomies.po b/Localization/fa/OrchardCore.Taxonomies.po
index c5e7b712f04ca..54651e1ed3294 100644
--- a/Localization/fa/OrchardCore.Taxonomies.po
+++ b/Localization/fa/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "وارد کردن یک مقدار برای {0} ضروری است"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "فیلترهای طبقه بندی"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "برچسب ها"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "دسته مورد نظر پیدا نشد. لطفا تنظیمات مربوط به این فیلد بررسی شود."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "خطا در ایجاد برچسب"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "برای جستجو تایپ کنید"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "انتخاب"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "حذف"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "برای ایجاد برچسب Enter کنید"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "برچسبی یافت نشد"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "برچسب ها"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "دسته مورد نظر پیدا نشد. لطفا تنظیمات مربوط به این فیلد بررسی شود."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "توضیحی که برای ویرایشگر این فیلد نمایش داده می‌شود."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "دسته‌بندی"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "ضروری"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "حداقل یک المان انتخاب شده باشد."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "منحصربه‌فرد"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "تعیین اینکه آیا فقط یک المان را می توان انتخاب کرد."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "فقط زیرشاخه‌ها"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "فقط امکان انتخاب زیر شاخه‌ها وجود داشته باشد."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "آیا می توان برچسب های جدید را به صورت درون خطی ایجاد کرد یا خیر. توجه: هنگام ایجاد برچسب‌ها به صورت درون خطی، فقط ویژگی عبارت text display تنظیم می‌شود."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "نوع محتوا"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "افزودن {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "شما ترتیب دسته‌ها را عوض کرده‌اید."
diff --git a/Localization/fa/OrchardCore.Templates.Cms.Module.po b/Localization/fa/OrchardCore.Templates.Cms.Module.po
index 75bfd478693d7..7c2add8068867 100644
--- a/Localization/fa/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/fa/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 20:37\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "نمایش"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/fa/OrchardCore.Templates.po b/Localization/fa/OrchardCore.Templates.po
index 3c0e7c96bc5bc..1acd8f2704b1e 100644
--- a/Localization/fa/OrchardCore.Templates.po
+++ b/Localization/fa/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "قالب \"{0}\" ایجاد شده است."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "قالب با موفقیت حذف شد."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "قالب‌ها با موفقیت حذف شدند."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "همه قالب‌ها"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "نام قالب."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "توضیحات قالب."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "نام قالب."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "توضیحات قالب."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/fa/OrchardCore.Tenants.po b/Localization/fa/OrchardCore.Tenants.po
index 82fe71b2828e3..d351b9817a4dc 100644
--- a/Localization/fa/OrchardCore.Tenants.po
+++ b/Localization/fa/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "تِننت‌ها (Tenants)"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "همه"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "همه حالت‌ها"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "درحال‌اجرا"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "غیرفعال"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "آماده‌سازی‌نشده"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "نام"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "حالت"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "غیرفعال"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "فعال"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "غیر‌فعال‌کردن tenant پیش‌فرض میسر نیست."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "تِننت {0} در حال حاضر غیرفعال است."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "تِننت {0} در حال حاضر فعال است."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr "تنها امکان غیرفعال‌کردن یک tenant فعال میسر است."
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "تنها امکان فعال‌کردن یک tenant غیرفعال میسر است."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr "فقط امکان حذف مستاجر \"غیرفعال\" یا \"غیراصلی\" میسر است."
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr "هنگام حذف مستاجر \"{0}\" خطایی روی داد. {1}"
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr "مستاجر \"{0}\" حذف شد، برای اطلاعات بیشتر به فایل گزارش مراجعه کنید."
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr "تنها امکان غیرفعال‌کردن یک tenant فعال میسر است."
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr "تنها امکان فعال‌کردن یک tenant غیرفعال میسر است."
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr "شما فقط می توانید یک مستاجر \"غیرفعال\" یا \"غیر اولیه\" را حذف کنید."
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr "هنگام حذف مستاجر \"{0}\" خطایی روی داد."
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "نام کاربری '{0}' نامعتبر است، نام کاربری باید فقط شامل حروف و اعداد باشد."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "ایمیل نامعتبر است."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Tenant یافت نشد: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "راه‌اندازی tenant میسر نیست."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "ارائه‌دهنده‌ پایگاه‌داده تعریف نشده است."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr "ارائه‌دهنده‌ پایگاه‌داده پشتیبانی نمی شود."
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "رشته اتصال برای این ارائه‌دهنده پایگاه‌داده ضروری است."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "'Recipe' یا 'RecipeName' ضروری است."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "دستورالعمل '{0}' یافت نشد."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr "پروفایلهای ویژگی"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr "نام tenant اجباری است."
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr "نمایه ویژگی وجود ندارد."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr "نام tenant نامعتبر است. تنها باید شامل کاراکتر باشد و از فاصله استفاده نشود."
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr "پیشوند هاست و آدرس نمی‌توانند در یک زمان خالی باشند."
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr "پیشوند آدرس نمی‌تواند بیش از یک segment داشته باشد."
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr "یک tenant با هاست و پیشوند مشابه در حال حاضر وجود دارد."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr "نام مستاجر با مستاجر «پیش‌فرض» در تضاد است."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr "یک tenant با همین نام وجود دارد."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr "مستاجر موجود برای تأیید یافت نشد."
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr "ارائه دهنده پایگاه داده ارائه شده پشتیبانی نمی شود."
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "رشته اتصال ارائه شده نامعتبر است یا سرور غیر قابل دسترسی است."
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr "فایل پایگاه داده مرتبط در حال حاضر در حال استفاده است."
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "پایگاه داده ارائه شده، پیشوند جدول و الگو در حال حاضر در حال استفاده هستند."
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr "به صورت اختیاری مشخص کنید که کدام تنظیمات پیش فرض باید برای تجربه راه اندازی استفاده شود."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr "رشته اتصال به پایگاه‌داده شما. به عنوان مثال {0}."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr "پیشوند نام جدول"
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr "رشته اتصال"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr "به صورت اختیاری مشخص کنید که کدام پروفایل ویژگی باید برای این مستاجر (tenant) اعمال شود."
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr "طبقه ی مستاجر."
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr "(اختیاری) مثال: اگر پیشوند \"site1\" باشد، پیشوند URL مستاجر \"https://orchardcore.net/site1\" است."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr "شرح مستاجر."
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "ایجاد Tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "ایجاد تِنَنت (Tenant)"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "انتخاب نام تِنَنتی که مایل به ایجاد آن هستید."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(اختیاری) شرح مستاجر برای ایجاد."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr "(اختیاری) مثال: اگر پیشوند \"site1\" باشد، پیشوند URL مستاجر \"http://orchardproject.net/site1\" است."
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "مثال: اگر هاست \"orchardproject.net\" باشد، آدرس سایت tenant به فرم \"/http://orchardproject.net\" خواهد بود. از Liquid پشتیبانی می‌شود."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "از چه نوع پایگاه‌داده‌ای استفاده شود؟"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "پیشوند نام جداول"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "رشته اتصال"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "به عنوان مثال، '{0}' برای SQL Server."
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "دستورالعمل"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "غیرفعال کردن تِنَنت"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "ویرایش tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "فعال کردن تِنَنت"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "یک تِنَنت را فعال می‌کند."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr "نام پروفایل ویژگی."
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr "نامعتبر"
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "طراحی"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "راه‌اندازی تِنَنت"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "انتخاب نام تِنَنتی که مایل به راه‌اندازی آن هستید."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "نام سایت"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "نام کاربری ادمین"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "ایمیل ادمین"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "رمزعبور ادمین"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "از چه نوع پایگاه‌داده‌ای استفاده شود؟"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "پیشوند نام جداول"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "رشته اتصال"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "به عنوان مثال، '{0}' برای SQL Server."
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/fa/OrchardCore.Tests.po b/Localization/fa/OrchardCore.Tests.po
index 7575ea38bbf45..bb7f29a3abc2b 100644
--- a/Localization/fa/OrchardCore.Tests.po
+++ b/Localization/fa/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-08 14:20\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr "افزودن وظیفه"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr "تست"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr "نوشتن وظیفه خط"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr "تست"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr "انجام شد"
diff --git a/Localization/fa/OrchardCore.Themes.po b/Localization/fa/OrchardCore.Themes.po
index 03f541956232f..b925103617541 100644
--- a/Localization/fa/OrchardCore.Themes.po
+++ b/Localization/fa/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "از پوسته سایت و پوسته پنل مدیریتی که در در حال حاضر برای سایت انتخاب شده است، خروجی می‌گیرد."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/fa/OrchardCore.Title.po b/Localization/fa/OrchardCore.Title.po
index 9af5e1be45c87..e5e4223978657 100644
--- a/Localization/fa/OrchardCore.Title.po
+++ b/Localization/fa/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "یک مقدار برای عنوان مورد نیاز است."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr "یک مقدار برای عنوان مورد نیاز است."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "الگو شامل عبارت Liquid معتبری نیست. توضیحات: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "عنوان با استفاده از الگو به طور خودکار ایجاد می شود."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "برای نمایش عنوان در نماها تیک بزنید."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fa/OrchardCore.Twitter.po b/Localization/fa/OrchardCore.Twitter.po
index c0821cc2233c5..a5154fefaaad6 100644
--- a/Localization/fa/OrchardCore.Twitter.po
+++ b/Localization/fa/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "رمز دسترسی مورد نیاز است"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "وظیفه به‌روزرسانی وضعیت توییتر"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "اجتماعی"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "انجام‌نشد"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr "توییتر"
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "پس از ذخیره تنظیمات، tenant جاری، مجدد بارگذاری خواهد شد."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "مستندات را ببینید"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "هنگام رمزگشایی یک تنظیم خطایی روی داد. لطفا اعمال و ذخیره کنید."
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "تنظیمات ادغام توییتر"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "کلید API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "کلید API در تب Keys and Tokens در داشبرد برنامه توییتر تعریف می‌شود."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "کلید مخفی API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "کلید مخفی API در تب Keys and Tokens در داشبرد برنامه توییتر تعریف می‌شود."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "توکن دسترسی"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "توکن دسترسی در تب Keys and Tokens در داشبرد برنامه توییتر تعریف می‌شود."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "کلید مخفی توکن دسترسی"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "کلید مخفی توکن دسترسی در تب Keys and Tokens در داشبرد برنامه توییتر تعریف می‌شود."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "ورود به سامانه با تنظیمات توییتر"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "به‌روزرسانی وضعیت توییتر"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/fa/OrchardCore.Users.Core.po b/Localization/fa/OrchardCore.Users.Core.po
index 17772c71e2fea..9ab2568098a11 100644
--- a/Localization/fa/OrchardCore.Users.Core.po
+++ b/Localization/fa/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-20 12:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "ایمیل {0} نامعتبر است."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "خطای غیرمنتظره: '{0}'."
diff --git a/Localization/fa/OrchardCore.Users.po b/Localization/fa/OrchardCore.Users.po
index 2ec5ee1f2c937..1bb3ad8ecfd7d 100644
--- a/Localization/fa/OrchardCore.Users.po
+++ b/Localization/fa/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "کاربر با موفقیت ایجاد شد"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "ورود به سیستم محلی غیر فعال شده است."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "حساب قفل شده است"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "تلاش ناموفق برای ورود به سیستم"
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "گذرواژه ی شما با موفقیت تغییر کرد."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "خطایی در ارائه دهنده خارجی رخ داد."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "ثبت‌نام کاربر در وب‌سایت مجاز نیست."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "حساب کاربری خود را تایید کنید"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "کاربر مشخص شده مجاز به ورود به سیستم نیست."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "شما باید ایمیل خود را تایید کنید."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "همه کابران"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "کاربران فعال"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "کاربران غیر فعال"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "نام"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "ایمیل"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "تایید"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "فعال‌کردن"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "غیرفعال‌کردن"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "پاک‌کردن"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "همه نقش ها"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "احراز هویت (بدون نقش)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "کاربر {0} با موفقیت تایید شد."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "کاربر {0} با موفقیت پاک شد."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "کاربر {0} با موفقیت غیرفعال شد."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "کاربر {0} با موفقیت فعال شد."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "کاربر با موفقیت ایجاد شد."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "کاربر با موفقیت بروز رسانی شد."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "کاربر با موفقیت حذف شد."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "حذف کاربر میسر نیست."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "رمزعبور باموفقیت به‌روزرسانی شد."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "کاربر با موفقیت از حالت قفل خارج شد."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "قفل کاربر باز نشد."
@@ -554,19 +554,19 @@ msgstr "تغییر رمزعبور"
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:116
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Invalid phone number used."
-msgstr ""
+msgstr "شماره تلفن نامعتبر است."
 
 #. await Notifier.ErrorAsync(H["We are unable to send you an SMS message at this time. Please try again later."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:136
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "We are unable to send you an SMS message at this time. Please try again later."
-msgstr ""
+msgstr "ما در حال حاضر نمی توانیم برای شما پیامک ارسال کنیم. لطفاً بعداً دوباره امتحان کنید."
 
 #. await Notifier.SuccessAsync(H["We have successfully sent an verification code to your phone number. Please retrieve the code from your device."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:141
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "We have successfully sent an verification code to your phone number. Please retrieve the code from your device."
-msgstr ""
+msgstr "ما با موفقیت یک کد تأیید را به تلفن شما ارسال کردیم. لطفا کد را از دستگاه خود بازیابی کنید."
 
 #. await Notifier.ErrorAsync(H["Unable to find a phone number."]);
 #. await Notifier.ErrorAsync(H["Unable to find a phone number."]);
@@ -574,31 +574,31 @@ msgstr ""
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:184
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Unable to find a phone number."
-msgstr ""
+msgstr "امکان بازیابی شماره‌ی تلفن وجود ندارد."
 
 #. await Notifier.SuccessAsync(H["Your phone number has been confirmed."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:196
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Your phone number has been confirmed."
-msgstr ""
+msgstr "شماره همراه شما تایید گردیده است."
 
 #. await Notifier.ErrorAsync(H["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:201
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Invalid verification code."
-msgstr ""
+msgstr "کد تأیید نامعتبر است."
 
 #. var errorMessage = S["The SMS message could not be sent. Please attempt to request the code at a later time."];
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:211
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "The SMS message could not be sent. Please attempt to request the code at a later time."
-msgstr ""
+msgstr "پیامک ارسال نشد. لطفاً سعی کنید در زمان دیگری کد را درخواست کنید."
 
 #. message = result.Succeeded ? S["A verification code has been sent to your phone number. Please check your device for the code."].Value
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:236
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "A verification code has been sent to your phone number. Please check your device for the code."
-msgstr ""
+msgstr "یک کد تایید به شماره تلفن شما ارسال شده است. لطفا دستگاه خود را برای کد بررسی کنید."
 
 #. await Notifier.ErrorAsync(H["You cannot remove the only active two-factor method."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationBaseController.cs:85
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr "یافتن یک ارائه دهنده فعال دو عاملی ممکن نیست."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr "حساب قفل شده است."
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr "کد تأیید نامعتبر است."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr "حساب قفل شده است"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -756,58 +756,52 @@ msgstr "نمی توان تنها ادمین فعال را غیرفعال کرد.
 #: OrchardCore.Users\Drivers\UserInformationDisplayDriver.cs:140
 msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
-msgstr ""
-
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "نمی توانید نقش های خود را به روز کنید."
+msgstr "لطفا یک شماره تلفن معتبر فراهم کنید."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "تنظیمات ورود"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "تنظیمات ورود را صادر می کند."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "تنظیمات ایمیل را تغییر دهید"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "تنظیمات تغییر ایمیل را صادر می کند."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "تنظیمات ثبت نام"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "تنظیمات ثبت نام را صادر می کند."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "تنظیمات رمز عبور را بازنشانی کنید"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "تنظیمات بازنشانی رمز عبور را صادر می کند."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "رمز عبور جدید و رمز عبور تأیید مطابقت ندارند."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "وظیفه اختصاص نقش کاربر"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "کاربر"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "ناموفق"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "وظیفه ثبت‌نام کاربر"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "کاربر"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "معتبر"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "نامعتبر"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "هیچ سرویس ایمیلی موجود نیست"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "رویداد کاربر بروز شده"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "کاربر"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "اعتبارسنجی وظیفه کاربر"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "ناشناس"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "احراز هویت شده"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "در نقش"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "یک مقدار برای {0} لازم است."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} به نقش {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "کاربری که اختصاص می‌یابد. با پشتیبانی از Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "تغییر رمزعبور"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "رمزعبور فعلی"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "رمزعبور جدید"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "ایجاد کاربر"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "ویرایش رمزعبور"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "رمزعبور جدید"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr "تنظیمات احراز هویت ایمیل"
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr "موضوع ایمیل برای ارسال کد تایید. Liquid syntax پشتیبانی می شود."
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "لطفا ایمیل خود را برای تغییر رمز عبور چک کنید."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr "لطفا کد را وارد کنید"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "تغییر ایمیل"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1584,37 +1656,37 @@ msgstr "درخواست کد"
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:6
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Two-Factor Authentication"
-msgstr ""
+msgstr "احراز هویت دو مرحله‌ای"
 
 #. <li class="breadcrumb-item active" aria-current="page">@RenderTitleSegments(T["Configure SMS Authenticator"])</li>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:7
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Configure SMS Authenticator"
-msgstr ""
+msgstr "پیکربندی احراز هویت پیامکی"
 
 #. @T["To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."]
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:12
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
-msgstr ""
+msgstr "برای استفاده از پیامک به عنوان یک روش احراز هویت دو مرحله‌ای، لطفاً روی دکمه «درخواست کد» در زیر کلیک کنید تا شماره تلفن خود را تأیید کنید."
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
-msgstr ""
+msgstr "شماره تلفن"
 
 #. <span>@T["Phone number must include a country code. For example, +1 for United States."]</span>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:21
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone number must include a country code. For example, +1 for United States."
-msgstr ""
+msgstr "شماره تلفن باید شامل کد کشور باشد. برای مثال، +1 برای ایالات متحده."
 
 #. <button type="submit" class="btn btn-primary">@T["Request Code"]</button>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:24
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Request Code"
-msgstr ""
+msgstr "درخواست کد"
 
 #. @{
 #. <div class="d-flex align-items-center">@T["Two-Factor Authentication"]</div>
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr "این دستگاه را فراموش کن"
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "شما با موفقیت توسط <strong>{0}</strong> احرازهویت شده‌اید. هم‌اکنون یک اکانت با این آدرس ایمیل دارید. رمزعبور داخلی خود را وارد کنید و جهت لینک کردن اکانت‌ها بر روی دکمه ثبت‌نام کلیک کنید تا فرایند ورود به سیستم به پایان برسد."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "نام‌کاربری"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "ایمیل"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "ورود"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "برای ورود به سیستم از سرویس دیگری استفاده کنید"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "با استفاده از حساب {0} خود وارد شوید"
@@ -1872,7 +1944,7 @@ msgstr "به کاربر اجازه دهید ایمیل خود را تغییر د
 #: OrchardCore.Users\Views\LoginSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Users.Views.LoginSettings.Edit"
 msgid "Allow user to change their phone number"
-msgstr ""
+msgstr "به کاربر اجازه دهید شماره تلفن خود را تغییر دهد"
 
 #. <label class="form-check-label" asp-for="UseSiteTheme">@T["Use site theme for login page"]</label>
 #: OrchardCore.Users\Views\LoginSettings.Edit.cshtml:36
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr "ورود شما با روش احراز هویت دوم محافظت می شود."
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "ایجاد یک حساب جدید"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "نام کاربری"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "ایمیل"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "رمزعبور"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "شما با موفقیت توسط <strong>{0}</strong> احرازهویت شده‌اید. لطفا جهت پایان فرایند ثبت‌نام، فرم زیر را پر کرده و بر روی دکمه ثبت‌نام کلیک کنید."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "نام‌کاربری"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "ایمیل"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "رمزعبور"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "ارسال ایمیل تایید"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "موضوع پیام. از Liquid syntax پشتیبانی می کند."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "صفحه اصلی"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr "لطفا کد را وارد کنید"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "تغییر رمزعبور"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "ایمیل"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "رمزعبور جدید"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2506,13 +2578,13 @@ msgstr "برای ورود می توانید از هر یک از کدهای زی
 #: OrchardCore.Users\Views\SmsAuthenticatorLoginSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.SmsAuthenticatorLoginSettings.Edit"
 msgid "SMS Authenticator Settings"
-msgstr ""
+msgstr "تنظیمات احراز هویت پیامکی"
 
 #. <label class="form-check-label" asp-for="Body">@T["Message Body"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.SmsAuthenticatorLoginSettings.Edit"
 msgid "Message Body"
-msgstr ""
+msgstr "متن پیام"
 
 #. <span class="hint dashed">@T["The body to the message for sending the verification code. Liquid syntax is supported."]</span>
 #: OrchardCore.Users\Views\SmsAuthenticatorLoginSettings.Edit.cshtml:11
@@ -2524,7 +2596,7 @@ msgstr ""
 #: OrchardCore.Users\Views\SmsAuthenticatorValidation.cshtml:6
 msgctxt "OrchardCore.Users.Views.SmsAuthenticatorValidation"
 msgid "Please <a href=\"#\" id=\"RequestCode\">click here</a> to receive a one-time verification code via SMS."
-msgstr ""
+msgstr "لطفاً برای دریافت کد تأیید یک بار مصرف از طریق پیامک <a href=\"#\" id=\"RequestCode\">اینجا را کلیک کنید</a>."
 
 #. @T["Dear {0},", Model.User.UserName]
 #: OrchardCore.Users\Views\TemplateUserConfirmEmail.cshtml:8
@@ -2662,31 +2734,31 @@ msgstr "از ایمیل خود برای دریافت کدهای یکبار مص
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Actions.cshtml:8
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Actions"
 msgid "Verify Phone Number"
-msgstr ""
+msgstr "تأیید شماره تلفن"
 
 #. <div class="btn btn-sm btn-success disabled me-1">@T["Verified"]</div>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Actions.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Actions"
 msgid "Verified"
-msgstr ""
+msgstr "تایید شده"
 
 #. <a asp-action="Index" asp-controller="SmsAuthenticator" class="btn btn-sm btn-primary me-1">@T["Edit"]</a>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Actions.cshtml:16
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Actions"
 msgid "Edit"
-msgstr ""
+msgstr "ویرایش"
 
 #. <h4>@T["SMS authentication"]</h4>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Content.cshtml:1
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Content"
 msgid "SMS authentication"
-msgstr ""
+msgstr "احراز هویت پیامکی"
 
 #. @T["Use your phone number to receive one-time codes."]
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Content.cshtml:3
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Content"
 msgid "Use your phone number to receive one-time codes."
-msgstr ""
+msgstr "از تلفن خود برای دریافت کدهای یکبار مصرف استفاده کنید."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["View User"])</h1></zone>
 #: OrchardCore.Users\Views\User.DetailAdmin.cshtml:4
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "کاربر غیرفعال شده است."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "کاربر فعال است."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "برای غیرفعال کردن یک حساب کاربری انتخاب نشده باشد."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -2900,7 +2972,7 @@ msgstr "ایمیل"
 #: OrchardCore.Users\Views\UserInfo.cshtml:14
 msgctxt "OrchardCore.Users.Views.UserInfo"
 msgid "Phone Number"
-msgstr ""
+msgstr "شماره تلفن"
 
 #. <dt>@T["Status"]</dt>
 #: OrchardCore.Users\Views\UserInfo.cshtml:18
@@ -2942,31 +3014,31 @@ msgstr "کاربر به سیستم وارد شده است."
 #: OrchardCore.Users\Views\UserMenu.cshtml:13
 msgctxt "OrchardCore.Users.Views.UserMenu"
 msgid "Users"
-msgstr ""
+msgstr "کاربران"
 
 #. <i class="fa-solid fa-sign-in-alt fa-fw" aria-hidden="true"></i> @T["Log in"]
 #: OrchardCore.Users\Views\UserMenu.cshtml:27
 msgctxt "OrchardCore.Users.Views.UserMenu"
 msgid "Log in"
-msgstr ""
+msgstr "ورود"
 
 #. <i class="fa-solid fa-envelope fa-fw" aria-hidden="true"></i> @T["Change Email"]
 #: OrchardCore.Users\Views\UserMenuItems-ChangeEmail.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-ChangeEmail"
 msgid "Change Email"
-msgstr ""
+msgstr "تغییر ایمیل"
 
 #. <i class="fa fa-desktop fa-fw" aria-hidden="true"></i> @T["Dashboard"]
 #: OrchardCore.Users\Views\UserMenuItems-Dashboard.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-Dashboard"
 msgid "Dashboard"
-msgstr ""
+msgstr "میزکار"
 
 #. <i class="fa-solid fa-user-lock fa-fw" aria-hidden="true"></i> @T["External Logins"]
 #: OrchardCore.Users\Views\UserMenuItems-ExternalLogins.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-ExternalLogins"
 msgid "External Logins"
-msgstr ""
+msgstr "ابزارهای دیگر ورود به سایت"
 
 #. <i class="far fa-address-card" aria-hidden="true"></i> @T["Profile"]
 #. <i class="far fa-address-card" aria-hidden="true"></i> @T["Profile"]
@@ -2974,61 +3046,61 @@ msgstr ""
 #: OrchardCore.Users\Views\UserMenuItems-Profile.cshtml:17
 msgctxt "OrchardCore.Users.Views.UserMenuItems-Profile"
 msgid "Profile"
-msgstr ""
+msgstr "پروفایل"
 
 #. @T["Signed in as"]<span class="ms-1 font-weight-bold">@User.Identity.Name</span>
 #: OrchardCore.Users\Views\UserMenuItems-SignedUser.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-SignedUser"
 msgid "Signed in as"
-msgstr ""
+msgstr "ورود به عنوان "
 
 #. <i class="fa-solid fa-key" aria-hidden="true"></i> @T["Change password"]
 #: OrchardCore.Users\Views\UserMenuItems-SignOut.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-SignOut"
 msgid "Change password"
-msgstr ""
+msgstr "تغییر رمزعبور"
 
 #. <i class="fa-solid fa-sign-out-alt" aria-hidden="true"></i> @T["Log off"]
 #: OrchardCore.Users\Views\UserMenuItems-SignOut.cshtml:9
 msgctxt "OrchardCore.Users.Views.UserMenuItems-SignOut"
 msgid "Log off"
-msgstr ""
+msgstr "خروج"
 
 #. <i class="fa-solid fa-shield-halved fa-fw" aria-hidden="true"></i> @T["Security"]
 #: OrchardCore.Users\Views\UserMenuItems-TwoFactor.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
-msgstr ""
+msgstr "امنیت"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr "نام کاربری"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
-msgstr ""
+msgstr "شماره تلفن"
 
 #. <i class="fas fa-check-circle text-success" title="@T["Verified"]"></i>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:11
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Verified"
-msgstr ""
+msgstr "تایید شده"
 
 #. <i class="fas fa-exclamation-circle" title="@T["Unverified"]"></i>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:15
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Unverified"
-msgstr ""
+msgstr "تایید نشده"
 
 #. <span>@T["Phone number must include a country code. For example, +1 for United States."]</span>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:19
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
-msgstr ""
+msgstr "شماره تلفن باید شامل کد کشور باشد. برای مثال، +1 برای ایالات متحده."
 
 #. <h6>@T["Roles"]</h6>
 #: OrchardCore.Users\Views\UserRoleFields.Edit.cshtml:5
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "انصراف"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3392,43 +3464,43 @@ msgstr "کاربر بروز شده است."
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:6
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Two-Factor Authentication"
-msgstr ""
+msgstr "احراز هویت دو مرحله‌ای"
 
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="SmsAuthenticator">@T["Configure SMS Authenticator"]</a></li>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:7
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Configure SMS Authenticator"
-msgstr ""
+msgstr "پیکربندی احراز هویت پیامکی"
 
 #. <li class="breadcrumb-item active" aria-current="page">@RenderTitleSegments(T["SMS Code Validation"])</li>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:8
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "SMS Code Validation"
-msgstr ""
+msgstr "اعتبارسنجی کد پیامکی"
 
 #. @T["Please check your phone for a verification code and provide it below."]
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:13
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please check your phone for a verification code and provide it below."
-msgstr ""
+msgstr "لطفا تلفن خود را برای کد تایید بررسی کنید و آن را در زیر وارد نمایید."
 
 #. <input asp-for="Code" class="form-control" autocomplete="off" placeholder="@T["Please enter the code"]" />
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:21
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
-msgstr ""
+msgstr "لطفا کد را وارد کنید"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
-msgstr ""
+msgstr "کد تایید"
 
 #. <button type="submit" class="btn btn-lg btn-primary">@T["Verify"]</button>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:25
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verify"
-msgstr ""
+msgstr "تایید"
 
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Validate User"])</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Design.cshtml:7
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "اگر کاربر احراز هویت شده باشد، ویژگی گردش کار «UserName» را تنظیم کنید"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "نقش‌ها"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "در صورتی که کاربر حداقل یکی از نقش های انتخاب شده را داشته باشد، نتیجه \"InRole\" فعال می شود."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/fa/OrchardCore.Widgets.po b/Localization/fa/OrchardCore.Widgets.po
index 7e1f1c465f205..04094fd82420c 100644
--- a/Localization/fa/OrchardCore.Widgets.po
+++ b/Localization/fa/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "افزودن ابزارک"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "استاندارد"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/fa/OrchardCore.Workflows.po b/Localization/fa/OrchardCore.Workflows.po
index df6a0be9a27af..8c46e24891cb4 100644
--- a/Localization/fa/OrchardCore.Workflows.po
+++ b/Localization/fa/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "انجام وظیفه معامله"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "نشست"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "معتبر"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "نامعتبر"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "وظیفه مرتبط‌کردن"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "اولیه‌ها"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "وظیفه حلقه For Each"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "تکرار"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "وظیفه انشعاب"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "وظیفه حلقه For Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "تکرار"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "وظیفه If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "صحیح"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "نادرست"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "وظیفه اتصال"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "متصل‌شده"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "وظیفه گزارش (Log)"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "اولیه‌ها"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "انجام شد"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "استثنائات (خطاها)"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "وظیفه آگاه‌سازی"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "رابط کاربری"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "وظیفه اسکریپت"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "وظیفه تنظیم خروجی"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "اولیه‌ها"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "وظیفه تنظیم ویژگی (property)"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "اولیه‌ها"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "وظیفه حلقه While"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "کنترل گردش"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "تکرار"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "انجام شد"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "فعالیت با موفقیت به روز شد."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "اخیرا ایجاد شده است"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "حداقل اخیرا ایجاد شده است"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "ایراد گرفته است"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "تمام شده"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "حذف"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "گردش‌کار {0} پاک شده است."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "حذف"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "گردش کار {0} پاک شده است."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "گردش کار ذخیره شده است."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "گردش کار {0} حذف شد"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "وظیفه تغییرمسیر Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "انجام شد"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "رویداد درخواست Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "انجام شد"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "تطبیق‌یافته"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "وظیفه درخواست Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "وضعیت Http کنترل نشده"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "وظیفه پاسخ Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "انجام شد"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "مجاز به راه اندازی \"{0}\" نیست."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "وظیفه‌ای که گردش‌کار را راه‌اندازی می‌کند"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "ویرایش"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "افزودن"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "مرتبط کردن"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "بازگشت"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "آیا مطمئن هستید که می خواهید این نمونه گردش کار را حذف کنید?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "پاک‌کردن"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "مقدار انقضای قفل در برگه پیشرفته نامعتبر است"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "وقفه در میلی ثانیه برای به دست آوردن قفل قبل از ازسرگیری یک نمونه گردش کار معین از این نوع به صورت اتمی. آن را صفر بگذارید تا از هیچ قفلی استفاده نکنید."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "رویدادهای موجود"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "وظایف موجود"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "آیا مطمئن هستید که می‌خواهید این فعالیت را پاک کنید؟"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "فیلتر"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "مقدار انقضای قفل در برگه پیشرفته نامعتبر است"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "وقفه در میلی ثانیه برای به دست آوردن قفل قبل از ازسرگیری یک نمونه گردش کار معین از این نوع به صورت اتمی. آن را صفر بگذارید تا از هیچ قفلی استفاده نکنید."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "تکرار <em>{0}</em> از <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "لیستی که آیتم‌های آن یکی‌یکی تکرار می‌شوند. با پشتیبانی از JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "بدون انشعابات"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "تکرار <em>{0}</em> از <em>{1}</em> به <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "مقدار شروع. با پشتیبانی از JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "مقدار پایانی. با پشتیبانی از JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "مقداری که در هر تکرار حلقه به شمارنده حلقه افزوده می‌شود. با پشتیبانی از JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "تغییر مسیر HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "آدرسی جایی که می‌خواهید به آن تغییر مسیر دهد. با پشتیبانی از Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "دائمی"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "تغییر مسیر دائمی (301) انجام شود. در صورتی که ابن گزینه انتخاب نشود، تغییر مسیر موقتی (302) خواهد بود."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "رسیدگی به درخواست HTTP ورودی"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "هرکسی که به این آدرس دسترسی داشته باشد، امکان راه‌اندازی این گردش کار را خواهد داشت. لطفا در جای امنی نگهداری شود."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "اعتبارسنجی Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "در صورتی که درخواست از یک سرویسی ارسال می‌شود که این آدرس را به عنوان یک webhook فراخوانی می‌کند، این گزینه انتخاب نشود. اگر این آدرس توسط یک فرم درخواست می‌شود، جهت حصول اطمینان از دست‌نخورده باقی ماندن مقادیر فرم، این گزینه انتخاب شود."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "طول عمر توکن"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "بعد از تغییر این مقدار دکمه <b>بازتولید</b> را فشار دهید."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "تعداد روزی که توکن پس از آن منقضی می‌شود. در صورتی که مقدار 0 وارد شود، توکن هیچ‌وقت منقضی نمی‌شود."
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "فیلتر کردن درخواست HTTP ورودی"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "متود HTTP جهت انطباق."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "نام controller جهت انطباق."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "نام action جهت انطباق."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr "<em>{0} {1}</em>"
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "آدرسی که درخواست به آن ارسال می‌شود. از Liquid syntax پشتیبانی می‌شود."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "متود HTTP. برای مثال: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "نوع محتوای بدنه (Body) درخواست."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "بدنه‌ای (body) که با درخواست‌های PUT ،Post و PATCH ارسال می‌شود."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "هریک از هدرهای HTTP اضافه را در یک خط ارائه دهید. برای مثال: Authorization: Bearer 123ABC. با پشتیبانی از Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "پاسخ HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "کد وضعیت HTTP که در جواب ارسال می‌شود. جهت مشاهده لیست کامل کدها <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">اینجا</a> for a complete list. کلیک کنید."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "نوع محتوای بدنه (Body) پاسخ."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "بدنه‌ای (body) که در پاسخ ارسال می‌شود. با پشتیبانی از Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "ارزیابی <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "چینش"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "آیا مطمئن هستید که می خواهید این نمونه گردش کار را حذف کنید?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "پاک‌کردن"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "{0} ایجاد شد"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>چیزی اینجا نیست!</strong>در این لحظه هیچ گردش‌کار متوقف‌شده‌ای وجود ندارد."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "بازگشت"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "انتخاب‌شده"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "غیرفعال"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "۱ مورد در حال اجرا"
-msgstr[1] "{0} مورد در حال اجرا"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "بعد از اتمام فعالیت <strong>هریک</strong> از فعالیت‌های ورودی، همه مسیرهای اجرا را به یک مسیر تبدیل کند."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "گزارش (Log)"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "سطح Log."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} اعلان"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "نوع اعلان."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "اسکریپت"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "لیستی از نتایج موجود که آیتم‌های آن توسط ویرگول از یک‌دیگر جدا شده‌اند."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "خروجی توسط {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "نام متغیر خروجی."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "تنظیم ویژگی ({0} (property"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "نام ویژگی‌ای (property) که می‌خواهید مقدار در آن قرار گیرد. اگر ویژگی مشخص‌شده‌ای وجود نداشته باشد، ایجاد و اضافه خواهد شد."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "وقتی که <em>{0}</em> راه‌اندازی می‌شود"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr "<em>{0}</em>"
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "هیچ عملیات کاربر-محوری، مشخص نشده است"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "نام یک یا چند عملیات که توسط ویرگول از هم جدا شده‌اند را وارد کنید."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "حلقه تا زمانی که شرط <em>{0}</em> ارضا شود، ادامه ‌می‌یابد"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "حلقه تا زمانی که شرط ارضا شود، تکرار می‌شود."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/fa/TheAdmin.po b/Localization/fa/TheAdmin.po
index 45dc9ca08b4cf..532e1682b87d7 100644
--- a/Localization/fa/TheAdmin.po
+++ b/Localization/fa/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "حالت روشن"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "حالت تاریک"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "از سایت دیدن کنید"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "باز کردن / جمع کردن منو"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "حذف"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "آیا مطمئن هستید که می خواهید این عنصر را حذف کنید?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "تائید"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "انصراف"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr "صفحات فهرست"
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/fa/TheAgencyTheme.po b/Localization/fa/TheAgencyTheme.po
index 23806bad0beef..c622f1f497003 100644
--- a/Localization/fa/TheAgencyTheme.po
+++ b/Localization/fa/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-02-18 20:37\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "چنین نتایجی وجود ندارد."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "صفحه یافت نشد"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "صفحه مورد نظر شما یافت نشد."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/fa/TheBlogTheme.po b/Localization/fa/TheBlogTheme.po
index c479ca7905f8e..2f07c0e6d912e 100644
--- a/Localization/fa/TheBlogTheme.po
+++ b/Localization/fa/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-05-06 13:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "در {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "چنین نتایجی وجود ندارد."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "صفحه یافت نشد"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/fa/TheTheme.po b/Localization/fa/TheTheme.po
index ea5385e183cb6..78843c6493a60 100644
--- a/Localization/fa/TheTheme.po
+++ b/Localization/fa/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "به Orchard Core خوش آمدید، سایت شما با موفقیت راه‌اندازی شد."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/fi/OrchardCore.Admin.po b/Localization/fi/OrchardCore.Admin.po
index 3efa314c6b43e..166d5453207ea 100644
--- a/Localization/fi/OrchardCore.Admin.po
+++ b/Localization/fi/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Ylläpito"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Ylläpidon asetukset"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Vie järjestelmän ylläpitoasetukset."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Tervetuloa Orchard Coreen"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Selaa vapaasti valikkoa ja tutki mahdollisuuksia."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Ota käyttöön hallinnan tumma teema"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Käytetäänkö hallinnan tummaa teemaa."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Näytetäänkö otsikot yläpalkissa vai ei."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Ylläpito"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/fi/OrchardCore.AdminDashboard.po b/Localization/fi/OrchardCore.AdminDashboard.po
index a358a1826e45f..485101d417cad 100644
--- a/Localization/fi/OrchardCore.AdminDashboard.po
+++ b/Localization/fi/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Ei"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Sijainti"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Leveys"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/fi/OrchardCore.AdminMenu.po b/Localization/fi/OrchardCore.AdminMenu.po
index 3c9e8429c37b4..b626fc9dff384 100644
--- a/Localization/fi/OrchardCore.AdminMenu.po
+++ b/Localization/fi/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Luo ylläpitovalikko {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nimi"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Luo node"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Muokkaa ylläpitovalikkoa: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Muokkaa nodea"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Tämän linkin prioriteettiarvo, joka määrittää, näytetäänkö linkki aktiivisena kun yksi tai useampi linkki kohdistuu samaan URL-osoitteeseen. Valikossa näytetään aktiivisena se linkki, jolla on korkein arvo."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Tämän linkin sijainti ylläpitovalikossa."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Linkki"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Linkin teksti sellaisena kuin se näytetään puussa."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Linkin URL-osoite. Linkki näytetään vain siinä tapauksessa, että se tai jokin sen lapsista sisältää URL-osoitteen. Suhteellinen URL-osoite on suhteessa admin-sivuston juureen."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Valitse ikoni"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Ryhmä"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Valikkoteksti sellaisena kuin se näytetään puussa."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Valitse"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Valitse kuvake, joka näytetään, kun tämä nimike on valikon ensimmäisellä tasolla."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Valitse ikoni"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Käyttöoikeudet"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Kirjoita hakeaksesi"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Valitse"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Poista"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Ei tuloksia"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Vaaditaan käyttöoikeudet tämän valikkonimikkeen esittämiseksi (valinnainen)."
diff --git a/Localization/fi/OrchardCore.Alias.po b/Localization/fi/OrchardCore.Alias.po
index 34a984cdf020f..215e0cdbb9b0d 100644
--- a/Localization/fi/OrchardCore.Alias.po
+++ b/Localization/fi/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "Alias on jo käytössä. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Malli ei sisällä kelvollista Liquid-lauseketta. Yksityiskohdat: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Jätä tyhjäksi luodaksesi sen uudelleen."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias on luotu ja kenttä on pois käytöstä"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fi/OrchardCore.ArchiveLater.po b/Localization/fi/OrchardCore.ArchiveLater.po
index 75b1c7200fb11..7e839befc3dbf 100644
--- a/Localization/fi/OrchardCore.ArchiveLater.po
+++ b/Localization/fi/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:27\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "Arkistoi myöhemmin"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "Peruuta arkistoi myöhemmin"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/fi/OrchardCore.AuditTrail.po b/Localization/fi/OrchardCore.AuditTrail.po
index 6ba81a0e03683..1b6b96b8bcfc6 100644
--- a/Localization/fi/OrchardCore.AuditTrail.po
+++ b/Localization/fi/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Versiohistoria"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Kaikki kategoriat"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Aikaväli"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Versiohistoria"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Onko leikkaustehtävä poistettu käytöstä."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Säilytysaika päivissä."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/fi/OrchardCore.Autoroute.po b/Localization/fi/OrchardCore.Autoroute.po
index baaf7f0961bb8..a5bca32fe50d9 100644
--- a/Localization/fi/OrchardCore.Autoroute.po
+++ b/Localization/fi/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-10 11:56\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Pysyvä osoite on liian pitkä. Pysyvä osoite saa sisältää enintään {0} merkkiä."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Valitse poistaaksesi autoroute käytöstä tälle sisältökohteelle."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Valitse tämä, jos haluat, että alisisältö (child content item) reititetään absoluuttisella polulla."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fi/OrchardCore.BackgroundTasks.po b/Localization/fi/OrchardCore.BackgroundTasks.po
index abfcb58a0227a..4d50120ba64ba 100644
--- a/Localization/fi/OrchardCore.BackgroundTasks.po
+++ b/Localization/fi/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-22 07:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "Otsikko"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "Kuvaus"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Virheellinen lukituksen pääättymisarvo lisäasetukset-välilehdessä"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Ohitetaan, jos jaettua lukitustoimintoa ei ole käytössä."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/fi/OrchardCore.ContentFields.po b/Localization/fi/OrchardCore.ContentFields.po
index 75949d9db5230..1a3fff8103018 100644
--- a/Localization/fi/OrchardCore.ContentFields.po
+++ b/Localization/fi/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Vaihda"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Ohjeteksti, joka näytetään tälle kentälle editorissa."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Ei sisältökohteita."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standardi"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Julkaisematon"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Kirjoita hakeaksesi"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Valitse"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Poista"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Ei tuloksia"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Sallitaan useiden elementtien valitseminen."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Näytä kaikki sisältötyypit"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "Kaikkien näiden stereotyyppien sisältötyypit"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Näytettävät sisältötyypit. Valitse vähintään yksi."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tämän kentän vihjeteksti, mikä esitetään editorissa."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Lokalisoitu"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tämän kentän vihjeteksti, mikä esitetään editorissa."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg-editori"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Anna editorin asetukset, kieleksi asetetaan 'html' tallettaessa."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Asetusten ohjeet"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Käytetäänkö Url-osoitetta kun valitaan \"Lisää media\" (oletuksena lisätään lyhytkoodi)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Asetusten dokumentointi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL-osoite"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Linkkiteksti"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Url-osoitteen pakollisuus."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Käytä linkin url-osoitetta"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Url-osoitteen vihje, mikä näytetään editorissa."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Linkin tekstin yhteydessä näytettävä vihjeteksti."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Ohjeteksti (placeholder), mikä näytetään kun input-kenttä on tyhjä."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Ohjeteksti (placeholder), mikä näytetään kun input-kenttä on tyhjä."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Ehdotettu kelvollinen url kun luodaan sisältökohdetta."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Ei sisältökohteita."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Standardi"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Julkaisematon"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Kirjoita hakeaksesi"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Valitse"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Poista"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Ei tuloksia"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Sallitaanko useiden elementtien valitseminen."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Näytettävät sisältötyypit. Valitse vähintään yksi."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Valintaruutulista"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Kirjoita hakeaksesi"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Valitse"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Poista"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Arvoja ei löydy"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ", "
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen vai ei."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Muokkaa tietoja"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON-kuvaus sallituista arvoista. Esim. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Vaihteluväli"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Ei mitään"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Spinneri"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tämän kentän vihjeteksti, mikä esitetään editorissa."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Vinkki, joka näytetään kun kenttä on tyhjä. (valinnainen)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Numeroiden lukumäärä desimaalipisteen jälkeen."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Pienin sallittu arvo. (valinnainen)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Suurin sallittu arvo. (valinnainen)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL-osoite"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "H6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Anna editorin asetukset."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Asetusten ohjeet"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Muokkaa tietoja"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON-kuvaus sallituista arvoista. Esim. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tämän kentän editorissa näytettävä vinkkiteksti."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Sekuntteja varten käytä jakajaa 60, esim. '15'. Millisekuntteja varten käytä jakajaa 1000, esim. '0.250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Ei käyttäjiä."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Standardi"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Ei käytössä"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Kirjoita hakeaksesi"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Valitse"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Poista"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Ei tuloksia"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Sallitaanko useamman elementin valinta."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Sallitaanko valitsimen näyttää kaikki käyttäjät kaikissa rooleissa."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Ohjeteksti, joka näytetään tälle kentälle editorissa."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Pakollinen"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Onko arvo pakollinen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Vihje"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tämän kentän editorissa näytettävä vinkkiteksti."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Leveys"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Videon leveys"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Korkeus"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Videon korkeus"
diff --git a/Localization/fi/OrchardCore.ContentLocalization.po b/Localization/fi/OrchardCore.ContentLocalization.po
index fea8f37876f31..ea1c6fb107055 100644
--- a/Localization/fi/OrchardCore.ContentLocalization.po
+++ b/Localization/fi/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Ei voitu luoda lokalisoitua versiota sisältökohteesta."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/fi/OrchardCore.ContentPreview.po b/Localization/fi/OrchardCore.ContentPreview.po
index e1c7eea6b0cbf..f729cf2f2666d 100644
--- a/Localization/fi/OrchardCore.ContentPreview.po
+++ b/Localization/fi/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Malli ei sisällä validia Liquid-lauseketta. Tarkat tiedot: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Esikatselu"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Esikatselu lopetettu"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Virhe esikatselussa"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fi/OrchardCore.ContentTypes.po b/Localization/fi/OrchardCore.ContentTypes.po
index 8bda9f154d1a9..a803125a89566 100644
--- a/Localization/fi/OrchardCore.ContentTypes.po
+++ b/Localization/fi/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Sisällön osat"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Näyttönimi ei voi olla tyhjä."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Samalla näyttönimellä oleva tyyppi on jo olemassa."
@@ -66,10 +66,10 @@ msgstr "Samalla näyttönimellä oleva tyyppi on jo olemassa."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Tekninen nimi ei voi olla tyhjä."
@@ -78,10 +78,10 @@ msgstr "Tekninen nimi ei voi olla tyhjä."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Teknisen nimen tulee alkaa kirjaimella."
@@ -90,10 +90,10 @@ msgstr "Teknisen nimen tulee alkaa kirjaimella."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Tekninen nimi sisältää virheellisiä merkkejä."
@@ -101,133 +101,133 @@ msgstr "Tekninen nimi sisältää virheellisiä merkkejä."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "Tekninen nimi on varattu sisäiseen käyttöön."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Sama tekninen nimi on jo käytössä."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Sisältötyyppi \"{0}\" on luotu."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\" asetukset on tallennettu."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" on poistettu."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "\"{0}\" osa on lisätty."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Samalla näyttönimellä oleva osa on jo olemassa."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Sama tekninen nimi on jo käytössä."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "\"{0}\" osa on poistettu."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Sisältöosan luominen epäonnistui."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Sisällön osa \"{0}\" on luotu."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Asetukset kohteelle \"{0}\" on tallennettu."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "Kenttiä ei ole."
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Samalla näyttönimellä oleva kenttä on jo olemassa."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Samaa teknistä nimeä käyttävä kenttä on jo olemassa."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "\"{0}\"-kenttä on lisätty."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Näyttönimi on vaihdettu muotoon \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Kentän \"{0}\" asetukset on tallennettu."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Kenttä \"{0}\" on poistettu."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Osan \"{0}\" asetukset on tallennettu."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Sisältötyypin nimi ei voi olla tyhjä."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Osaa \"{0}\" ei voitu lisätä. Osa on jo olemassa."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Lisää kohteeseen \"{0}\" uusi kenttä"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Kentän nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Lisää nimetty osa kohteeseen \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Uudelleen käytettävissä olevan osan nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Uudelleenkäytettävän osan tekninen nimi."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Vie määritetyn sisältötyypin ja osan määritelmät päivitystä varten."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Osan tekninen nimi."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Osan nimi sellaisena kuin se esitetään näkymissä. Jätä tyhjäksi käyttääksesi oletusasetusta."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Valitse mahdollistaaksesi osan liittämisen useamman kerran."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Tyypin tekninen nimi."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Tyypin nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Uusi sisältötyyppi"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Tyypin nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Uusi sisällön osa"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Luo"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Pilkulla erotettu luettelo poistettavista sisältötyypin määrityksistä"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Vie määritetyn sisältötyypin ja osan määritykset päivitystä varten."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Muokkaa sisältötyyppiä - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Kentät"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Muokkaa"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Poista"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Esitystila"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "Muokkain"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Lisää kenttä"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Osat"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Sisältää kentät nykyiseen tyyppiin"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Lisää osia"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Lisää nimetty osa"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Tallenna"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Poista"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" asetukset kohteelle \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Kentän nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Kentän tekninen nimi."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Minkä tyyppistä editoria tulisi käyttää?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Minkälaista esitysmoodia tulisi käyttää?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Tallenna"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Peruuta"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Jotkin kaikille tyyppeille yhteiset osaparametrit voidaan määrittää myös <a href=\"{0}\">osamäärittelyn </a>-tasolla."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Osan nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Osan nimi sellaisena kuin se näytetään käyttöliittymässä."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Minkä tyyppistä editoria tulisi käyttää?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Minkälaista esitysmoodia tulisi käyttää?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Tallenna"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Peruuta"
diff --git a/Localization/fi/OrchardCore.Contents.po b/Localization/fi/OrchardCore.Contents.po
index 02d2f01c94d07..d2948a323a5c7 100644
--- a/Localization/fi/OrchardCore.Contents.po
+++ b/Localization/fi/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Kohteen \"{0}\" julkaisu on lopetettu."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Kaikki sisältötyypit"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Yksi tai useampi validointivirhe on tapahtunut."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Vie versiohistorian asetukset."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Sisältö"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Valmis"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Versiohistoria"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Näytetäänkö versiohistorian kommentit muokatessa."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Päivämäärä, jolloin sisältökohde luotiin tai julkaistiin ensimmäisen kerran."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "Valitse tämä, jotta voit muokata sisältökohteen omistajaa. Myös <code>EditContentOwner</code> -käyttöoikeus vaaditaan."
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "ja jatka"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Toiminnot"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Sisältö"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Sisältöluonnos on tallennettu."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Sisältökohde"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Näytä kaikki sisältötyypit"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Valitse ikoni"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Näytä kaikki sisältötyypit"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Rajoita sisältönimikkeiden määrää tästä lähteestä. Huom: Vain yksi sisältötyyppi on valittavissa, kun tämä asetus on valittu."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Oletusfrekvenssi, jolla nämä sisältötyypit todennäköisesti muuttuvat."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Kaikki"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Mikä tahansa sisältötyyppi"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Luo sisältö"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Valitse, jos haluat julkaista sisällön, kun se on luotu. Sisällöstä luodaan luonnos, mikäli jätät tämän valitsematta."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Poista sisältö lausekkeella: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Näytä luonnos JSON-muodossa"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Lataa luonnos JSON-muodossa"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Näytä julkaistu versio JSON-muodossa"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Lataus julkaistu versio JSON-muodossa"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Näytä JSON-muodossa"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Kohdesuunnitelman käyttöönottoa varten vietävää sisältöä ei löytynyt. Luo käyttöönottosuunnitelma ja lisää siihen \"sisällön vienti käyttöönottotavoitteeseen\" -vaihe."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Sisältö"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Uusi"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Julkaise sisältö käyttäen lauseketta: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Nouda sisältöä lausekkeella: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Lopeta sisällön julkaiseminen lausekkeella: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Päivitä sisältö käyttämällä lauseketta: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Anna JavaScript-lauseke, joka evaluoi päivitettävän sisältökohteen ID:n (ContentItemId). Esimerkiksi: correlationId ()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/fi/OrchardCore.CustomSettings.po b/Localization/fi/OrchardCore.CustomSettings.po
index c4f583c74e1d0..9bfa104381ac8 100644
--- a/Localization/fi/OrchardCore.CustomSettings.po
+++ b/Localization/fi/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Mukautetut asetukset"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Kaikki"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/fi/OrchardCore.Data.YesSql.po b/Localization/fi/OrchardCore.Data.YesSql.po
index 780d5690796c3..2b12b486a6c58 100644
--- a/Localization/fi/OrchardCore.Data.YesSql.po
+++ b/Localization/fi/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "Taulujen poistaminen epäonnistui."
diff --git a/Localization/fi/OrchardCore.Demo.po b/Localization/fi/OrchardCore.Demo.po
index a10f107a2e2b6..0fec413e3ba65 100644
--- a/Localization/fi/OrchardCore.Demo.po
+++ b/Localization/fi/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr "KKKK pp, vvvv"
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Etunimi"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/fi/OrchardCore.Deployment.Remote.po b/Localization/fi/OrchardCore.Deployment.Remote.po
index a68398df8826d..c7dd1808229b7 100644
--- a/Localization/fi/OrchardCore.Deployment.Remote.po
+++ b/Localization/fi/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Lähettää käyttöönottosuunnitelman etä-instanssiin."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Asiakasohjelman nimi"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Luo etä-instanssi"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL-osoite"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Asiakasohjelman nimi"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Muokkaa etäasiakasta"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Asiakasohjelman nimi"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Muokkaa etä-instanssia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "Url-osoite"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Asiakasohjelman nimi"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/fi/OrchardCore.Deployment.po b/Localization/fi/OrchardCore.Deployment.po
index 729b99100de75..a94d55b3db2f5 100644
--- a/Localization/fi/OrchardCore.Deployment.po
+++ b/Localization/fi/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON-tuonti"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Poista"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Käyttöönottosuunnitelmat on poistettu onnistuneesti."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Nimi on pakollinen."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Samanniminen käyttöönottosuunnitelma on jo olemassa."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Käyttöönottosuunnitelma on päivitetty onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Käyttöönottosuunnitelma on poistettu onnistuneesti."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Luo käyttöönottosuunnitelma"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Kustomoitu tiedosto, joka lisätään suunnitelman osaksi."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Tiedostonimi sellaisena kuin se lisätään arkistoon."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Käyttöönottosuunnitelmat"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Kaikki"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Muokkaa käyttöönottosuunnitelmaa"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "JSON suunnitelma"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Reseptitiedosto, joka lisätään suunnitelman osaksi."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Reseptin nimi."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Reseptin näyttönimi."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Reseptin kuvaus."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Reseptin tekijä."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Reseptin www-sivusto."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Reseptin versio."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Reseptin kategoriat (pilkulla erotettuna)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/fi/OrchardCore.Diagnostics.po b/Localization/fi/OrchardCore.Diagnostics.po
index 257962cb549c8..6c72e95eb9209 100644
--- a/Localization/fi/OrchardCore.Diagnostics.po
+++ b/Localization/fi/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Selaimesi lähetti pyynnön, jota palvelin ei pystynyt käsittelemään."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Tämän pyynnön suorittamisessa tapahtui virhe."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Sinulla ei ole oikeutta tähän resurssiin."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Sivua ei löytynyt."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Sinulla ei ole oikeutta tarkastella tätä sisältöä."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/fi/OrchardCore.Email.Abstractions.po b/Localization/fi/OrchardCore.Email.Abstractions.po
index 07c4b45a9340a..c5ca2e434fa82 100644
--- a/Localization/fi/OrchardCore.Email.Abstractions.po
+++ b/Localization/fi/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Kenttä \"{0}\" on pakollinen."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Toimitustapaa \"{0}\" ei tueta."
diff --git a/Localization/fi/OrchardCore.Email.po b/Localization/fi/OrchardCore.Email.po
index 15740ced55c2f..22cdf00b6178e 100644
--- a/Localization/fi/OrchardCore.Email.po
+++ b/Localization/fi/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Virheellinen sähköpostiosoite."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Sähköposti tehtävä"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Viestit"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Virhe"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Lähetä sähköposti"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "Kirjoittajan sähköpostiosoite, joka määrittelee, keltä sähköposti on peräisin. Jätä tyhjäksi käyttääksesi määritettyä sähköpostiosoitetta. Liquid-tuella."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Lähettäjän sähköpostiosoite. Vaaditaan, mikäli se ei ole sama kuin \"Lähettäjä\"-kentän sähköpostiosoite. Liquid-syntaksin tuki."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Erillinen vastausosoite. Käytetään, jos haluat sähköpostin vastaukset lähetettävän eri osoitteeseen kuin mistä sähköposti on lähetetty."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Pilkulla erotettu luettelo vastaanottajien sähköpostiosoitteista. Liquid-tuki."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Asetukset"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Vastaanottaja"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Lähettäjä on valinnainen. Hyödyllinen, kun sähköpostin kirjoittaja on eri kuin sen lähettäjä."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Piilokopio"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Kopio"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Vastausosoite"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Aihe"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Sisältö"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Nykyinen ympäristö (tenant) ladataan uudelleen asetusten tallennuksen yhteydessä."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Oletusarvoinen sähköpostiosoite, jota käytetään lähettäjänä, ellei sähköpostin lähettäjää ole asetettu."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Verkon toimitusvaihtoehdot"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "SMTP-palvelimen verkkotunnus, esim. <i>smtp.meilintarjoaja.fi</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "SMTP-palvelimen portti (yleensä 25)."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Välityspalvelin on valinnainen."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "Välityspalvelimen portti on valinnainen."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Kun tämä asetus on valittuna, sovelluspoolin tai isäntäprosessin identiteettiä käytetään autentikoitumisessa sähköpostipalvelimella."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Autentikoinnissa käytettävä käyttäjänimi."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Määritetyn noutohakemiston toimitusvaihtoehdot"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Esim. <i>C:\\Polku\\Tämän\\Sivuston\\NoudettuunMeiliin</i> laittaaksesi sähköpostit <i>NoudettuunMeiliin</i>-hakemistoon C-asemalle."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/fi/OrchardCore.Facebook.po b/Localization/fi/OrchardCore.Facebook.po
index c89402e77e217..31865444726d1 100644
--- a/Localization/fi/OrchardCore.Facebook.po
+++ b/Localization/fi/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "FaceBook Body ei sisällä validia Liquid-lauseketta. Tiedot: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Body-osio ei sisällä validia Liquid-lauseketta. Tiedot: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Sisäänkirjautumisen asetukset"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Kyselypolku sovelluksen peruspolussa, johon käyttäjäagentti palautetaan. Välisovellus käsittelee tämän pyynnön heti sen saapuessa."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Lisäosan malli, joka on Liquid-muodossa."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Javascript-SDK:n versio"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Alusta joka sivulla"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/fi/OrchardCore.Features.po b/Localization/fi/OrchardCore.Features.po
index 7d0bad84d32f7..5680690c0f660 100644
--- a/Localization/fi/OrchardCore.Features.po
+++ b/Localization/fi/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Ominaisuudet"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Valitse yksi tai useampi ominaisuus."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "Tämä ominaisuus on aina käytössä, eikä sitä voi poistaa käytöstä."
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} oli {1}."
@@ -125,9 +125,9 @@ msgstr "Massatoiminnot"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Poista käytöstä"
@@ -136,8 +136,8 @@ msgstr "Poista käytöstä"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Ota käyttöön"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Luokittelematon"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "Tämä ominaisuus on automaattisesti käytössä riippuvuuden perusteella eikä sitä voida manuaalisesti poistaa käytöstä."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "Tämä ominaisuus on poistettu käytöstä automaattisesti riippuvuuden perusteella eikä sitä voi ottaa manuaalisesti käyttöön."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "Tämä ominaisuus on aina käytössä, eikä sitä voi poistaa manuaalisesti."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Kun {0}-ominaisuus poistetaan käytöstä, seuraavat siitä riippuvaiset ominaisuudet poistetaan myös käytöstä: {1}. Jatketaanko?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Poista ominaisuus käytöstä"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Kyllä"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Ei"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Tyhjää täynnä!</strong> Hakusi ei tuottanut tuloksia."
diff --git a/Localization/fi/OrchardCore.Flows.po b/Localization/fi/OrchardCore.Flows.po
index 9c84c8abd0851..6b02308ac849c 100644
--- a/Localization/fi/OrchardCore.Flows.po
+++ b/Localization/fi/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Lisää kohde"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Sisältötyypit, joita tämä Bag voi sisältää. Esim. dia diaesitystä varten."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Lisää komponentti"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Poista"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Oletko varma, että haluat poistaa tämän kohteen?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "Komponenteja ei löytynyt."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/fi/OrchardCore.Forms.po b/Localization/fi/OrchardCore.Forms.po
index 95dd010ff2e64..3fd872aeff66d 100644
--- a/Localization/fi/OrchardCore.Forms.po
+++ b/Localization/fi/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Vaihtoehdot on kirjoitettu virheellisessä muodossa."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Aseta tehtävä lomakkeen validointia varten"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validointi"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Kiinnitä Model State -tehtävä"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validointi"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Vahvista Antiforgery-tunniste"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validointi"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Kelvollinen"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Virheellinen"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Vahvista lomakekentän tehtävä"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validointi"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Kelvollinen"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Virheellinen"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Vahvista lomaketehtävä"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validointi"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Kelvollinen"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Virheellinen"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr "<em>{0}</em>: <em>{1}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Lomakkeen kentän nimi, jolla on virheellinen arvo."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Liittää lähetettävän lomakkeen kentät model stateen."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Teksti, joka näytetään painikkeessa."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Painikkeen tyyppi."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr "Tälle kentälle luotavan tunnisteen tyyppi."
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr "Teksti, joka näytetään."
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "Tämän lomakke-elementin ID."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr "Tälle kentälle luotavan validoinnin tyyppi."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Tämän lomake-elementin nimi."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "Url-osoite, johon lomake lähetetään."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Lomakkeen lähettämisessä käytettävä HTTP-metodi."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Valitse generoidaksesi väärentämisen estävän tunnuksen lomakkeelle."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Painikkeen tyyppi."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Näytettävä teksti, kun kentällä ei ole arvoa."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Tämän kentän oletusarvo."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Muokkaa tietoja"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON-kuvaus sallituista arvoista. Esim. {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr "Muokkaimen tyyli, jota kentässä käytetään."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Näytettävä teksti kun tekstialuekentällä ei ole arvoa."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Validoi <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Validoitavan lomakekentän nimi."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Tarkistaa, sisältääkö lähetetty lomake validointivirheitä."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/fi/OrchardCore.GitHub.po b/Localization/fi/OrchardCore.GitHub.po
index 37ef7aee94caf..e76de34f7877b 100644
--- a/Localization/fi/OrchardCore.GitHub.po
+++ b/Localization/fi/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "GitHub-autentikointiasetukset"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "CliendID on määritetty <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHubin</a> yleiset-välilehdellä."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Sovelluksesti salaisuus."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/fi/OrchardCore.Google.po b/Localization/fi/OrchardCore.Google.po
index f13e948b828af..ac6711a06a3e7 100644
--- a/Localization/fi/OrchardCore.Google.po
+++ b/Localization/fi/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Google Analytics -asetukset"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Googlen autentikointiasetukset"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Google API -konsolissa sovellukselle määritelty asiakastunnus."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Salaisuus, joka on määritelty Google API -konsolissa sovellusta varten."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/fi/OrchardCore.Html.po b/Localization/fi/OrchardCore.Html.po
index f5be7ef6eb289..c7e468a17c3dc 100644
--- a/Localization/fi/OrchardCore.Html.po
+++ b/Localization/fi/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg-editori"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Sisältökohteen runko."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Anna editorin asetukset, kieleksi asetetaan 'html' tallettaessa."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Asetusten ohjeet"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Käytetäänkö URL-osoitetta kun valitaan \"Lisää media\"-toiminnon kautta (oletuksena lisätään lyhytkoodi)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Valitse editorin asetukset"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Asetusten ohjeet"
diff --git a/Localization/fi/OrchardCore.Https.po b/Localization/fi/OrchardCore.Https.po
index b0d32c5bfa693..b9edec8280ef4 100644
--- a/Localization/fi/OrchardCore.Https.po
+++ b/Localization/fi/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Määrittää, tulisiko pysyvää 308-tyypin uudelleenohjausta käyttää väliaikaisen 307-typpisen uudelleenohjauksen sijaan silloin kun ohjataan HTTPS-yhteyteen."
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/fi/OrchardCore.Infrastructure.Abstractions.po b/Localization/fi/OrchardCore.Infrastructure.Abstractions.po
index fd30ce826a20e..340aa76e5ec22 100644
--- a/Localization/fi/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/fi/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2022-05-05 12:18\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "Valintaa \"{0}\" ei löytynyt"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Ominaisuus \"{0}\" on olemassa, mutta sitä ei ole kuvattu arvolla \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Virhe muunnettaessa arvoa \"{0}\" arvoksi \"{1}\" valinnassa \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Komennon argumentit \"{0}\" eivät vastaa komennon määritystä"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "Menetelmä \"{0}\" ei tue valintaa \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/fi/OrchardCore.Layers.po b/Localization/fi/OrchardCore.Layers.po
index 87554de4cb3c7..50899a8d2a3ce 100644
--- a/Localization/fi/OrchardCore.Layers.po
+++ b/Localization/fi/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Luo taso"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Kuvaus"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Muokkaa tasoa - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "Virhe päivitettäessä sääntöjärjestystä"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Tallenna"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Muokkaa komponentteja ja tasoja"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Komponentti siirretty onnistuneesti. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Kumoa</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Alueet"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Muista <a href=\"{0}\">määritä käytettävissä olevat alueet</a> ennen komponenttien lisäämistä"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Lisää komponentti"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "Komponentteja ei löytynyt."
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "Tasoja ei löytynyt."
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Tasot"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Valitse taso nähdäksesi siihen liittyvät komponentit."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Katso käyttöohjeet"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Muokkaa"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Poista"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Muista <a href=\"{0}\">luoda taso</a> ennen komponenttien lisäämistä"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Lisää"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Jos valittu, otsikko näytetään komponentin yhteydessä."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Taso, johon komponentti tulisi liittää."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/fi/OrchardCore.Liquid.po b/Localization/fi/OrchardCore.Liquid.po
index 140622fa037b5..2fbc2cbc942bf 100644
--- a/Localization/fi/OrchardCore.Liquid.po
+++ b/Localization/fi/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Liquid-runko ei sisällä validia Liquid-lauseketta. Yksityiskohdat: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/fi/OrchardCore.Lists.po b/Localization/fi/OrchardCore.Lists.po
index e6ac107962ea0..c5f52f2bf4e07 100644
--- a/Localization/fi/OrchardCore.Lists.po
+++ b/Localization/fi/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Edustaa linkkiä pääsisältökohteeseen järjestyksessä, jossa ne esitetään."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Edustaa sisältökokoelman kohteita."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Määritelty blogikirjoitus ei ole enää olemassa. Ole hyvä ja luo uusi blogikirjoitus."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Ei oikeutta poistaa tätä sisältöä"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Käyttäjänimi tai sähköpostiosoite tai salasana on virheellinen."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Luettelo on tyhjä"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "Poista RSS-syötteen linkin generointi käytöstä."
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Nykyinen syöte on saatavilla osoitteessa <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "Uusi"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Valitse tämä, jos haluat muuttaa kohteiden järjestystä manuaalisesti."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Listat"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Lisää ylävalikon nimike"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/fi/OrchardCore.Localization.po b/Localization/fi/OrchardCore.Localization.po
index a9ea1689575ff..fe168aa867e92 100644
--- a/Localization/fi/OrchardCore.Localization.po
+++ b/Localization/fi/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Kulttuurit"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Vaaditaan kulttuuri"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Sivusto on käynnistetty uudelleen, jotta asetukset on saatu voimaan."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Sivustolle määritetyt aktiiviset kulttuurit."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Kulttuurin asetukset"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Vie kulttuurin asetukset."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Lisää kulttuuri"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/fi/OrchardCore.Markdown.po b/Localization/fi/OrchardCore.Markdown.po
index 33800494e5bcb..c3508ef2c022d 100644
--- a/Localization/fi/OrchardCore.Markdown.po
+++ b/Localization/fi/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "\"{0}\" ei sisällä validia Liquid-lauseketta. Yksityiskohdat: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg-editori"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Sisällön runko, merkkausmuotoiltuna."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg-editori"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fi/OrchardCore.Media.po b/Localization/fi/OrchardCore.Media.po
index 79ccd7366d2ec..ebae467755a7f 100644
--- a/Localization/fi/OrchardCore.Media.po
+++ b/Localization/fi/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Tiedostoa ei voi siirtää, koska saman niminen tiedosto on jo olemassa"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Samanniminen profiili on jo olemassa."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Mediaprofiili on poistettu onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Mediaprofiilit on poistettu onnistuneesti."
@@ -181,95 +181,95 @@ msgstr "Mediaprofiilit on poistettu onnistuneesti."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Oletusarvo"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Mukautettu koko"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Oletus (maksimi)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Maksimi"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Rajaus"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Täyttö"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "BoxPad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Minimi"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Venytys"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Tiedostojen käsittelyssä tapahtui virhe."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Haetaanko resurssit vain pääkansiosta vai myös kaikista alikansioista."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Luo mediaprofiili"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Mediaprofiilin nimi."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Mediaprofiiliin liittyvä vinkki."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Valitse käsitellyn kuvan leveys. Oletusarvo tarkoittaa, että leveyttä koskevaa toimintoa ei käytetä."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Valitse käsitellyn kuvan korkeus. Oletusarvo tarkoittaa, että korkeustoimintoa ei käytetä."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Valitse koon muokkaamisen tyyppi."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Valitse käsiteltävälle kuvalle taustaväri. Tyhjä arvo tarkoittaa, että bgcolor-attribuuttia ei käytetä. Esimerkkejä hyväksyttävistä arvoista: 'valkoinen', 'ffff00', 'ffff0080', '128,64,32' ja '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Valitse muokattavan kuvan formaatti. Oletusarvo tarkoittaa, että formaattitoimintoa ei käytetä."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Muokkaa mediaprofiilia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Mediaprofiilin nimi."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Mediaprofiiliin liittyvä vinkki."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Valitse käsiteltävän kuvan leveys. Oletusarvo tarkoittaa, että leveyttä koskevaa toimintoa ei käytetä."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Valitse käsiteltävän kuvan korkeus. Oletusarvo tarkoittaa, että korkeustoimintoa ei käytetä."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Valitse kokomuokkaimen moodi kuvan käsittelyyn."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Valitse käsiteltävälle kuvalle taustaväri. Tyhjä arvo tarkoittaa, että bgcolor-attribuuttia ei käytetä. Esimerkkejä hyväksyttävistä arvoista: 'valkoinen', 'ffff00', 'ffff0080', '128,64,32' ja '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Valitse muokattavan kuvan formaatti. Oletusarvo tarkoittaa, että formaattitoimintoa ei käytetä."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Käänteinen"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Nimeä uudelleen"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Kaikki"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Vie kaikki tai määritetyt mediatiedostot."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Pienet esikatselukuvat"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Isot esikatselukuvat"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Liitetty"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Pienet esikatselukuvat"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Isot esikatselukuvat"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Valitse media"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Ok"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Sallitaanko ankkuripisteen valinta koon muuttamista varten."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fi/OrchardCore.Menu.po b/Localization/fi/OrchardCore.Menu.po
index e072921d31dbb..34684219c2985 100644
--- a/Localization/fi/OrchardCore.Menu.po
+++ b/Localization/fi/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-22 13:31\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Valikot"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Valikon nimike on poistettu onnistuneesti."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "Tämän sisällön julkaiseminen voi poistaa luodun sisällön. Korjaa mahdolliset sisältötyypin ongelmat etukäteen."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Muokkaa {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "Url-osoite"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Katso käyttöohjeet"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/fi/OrchardCore.Microsoft.Authentication.po b/Localization/fi/OrchardCore.Microsoft.Authentication.po
index 0ce401e98c14b..3cab211376d99 100644
--- a/Localization/fi/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/fi/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Microsoftin tilille tunnistautumisen asetukset (Microsoft Account Authentication Settings)"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "Sovelluksen tunniste (Application ID) löytyy Mircosoftin kehittäjäportaalin asetuksista."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Sovelluksen salaisuus (secrect key) löytyy Microsoftin kehittäjäportaalin asetuksista."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/fi/OrchardCore.Navigation.po b/Localization/fi/OrchardCore.Navigation.po
index b2d5078df90a6..e1d798f08ae53 100644
--- a/Localization/fi/OrchardCore.Navigation.po
+++ b/Localization/fi/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/fi/OrchardCore.Notifications.po b/Localization/fi/OrchardCore.Notifications.po
index 0381464835146..4bc707655f4a4 100644
--- a/Localization/fi/OrchardCore.Notifications.po
+++ b/Localization/fi/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr "Ilmoita sisällön omistajalle tehtävä"
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr "Ilmoita käyttäjälle tehtävä"
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "Ilmoitukset"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr "Valmis"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr "Epäonnistui: käyttäjää ei löytynyt"
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr "Lue"
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr "Äskettäin luodut"
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr "Aikaisemmin luodut"
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "Merkitse luetuksi"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "Merkitse lukemattomaksi"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr "Poista"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] "ilmoitus"
 msgstr[1] "ilmoitukset"
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr "{0} {1} luettu onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr "{0} {1} poistettiin onnistuneesti."
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr "Merkitse luetuksi"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr "Ei ilmoituksia."
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr "valitut"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] "Yksi kohde"
 msgstr[1] "{0} kohdetta"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr "Kohteet {0} - {1}"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "Poista"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
-msgstr "Ilmoita käyttäjälle"
+msgid "Notify Content Owner"
+msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "Voit käyttää Liquid-koodia."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,11 +378,11 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
-msgstr "Ilmoita omistajalle"
+msgid "Notify Content Owner"
+msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:2
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr "Ilmoita käyttäjälle"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "Voit käyttää Liquid-koodia."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] "ilmoitus"
-msgstr[1] "ilmoitukset"
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr "Sinulla on enemmän kuin {0} lukematonta {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr "Sinulla on {0} lukematonta {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
-msgstr "Sinulla ei ole lukemattomia ilmoituksia"
+msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
-msgstr "Ilmoituskeskus"
+msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/fi/OrchardCore.OpenId.po b/Localization/fi/OrchardCore.OpenId.po
index 52e032101401d..280961ead2275 100644
--- a/Localization/fi/OrchardCore.OpenId.po
+++ b/Localization/fi/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Luo uusi sovellus"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Muokkaa sovellusta"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "katso: "
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "esimerkki:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/fi/OrchardCore.Placements.po b/Localization/fi/OrchardCore.Placements.po
index 4db242dbc648c..56e77ee87ec55 100644
--- a/Localization/fi/OrchardCore.Placements.po
+++ b/Localization/fi/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "Sijoittelusääntö on jo olemassa \"{0}\". Muokkaa olemassa olevaa sääntöä."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "Sijoittelu \"{0}\" on tallennettu."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "Sijoittelu \"{0}\" on tyhjä."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "Sijoittelu \"{0}\" on poistettu."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "Virhe sijoittelun validoinnissa<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "Virhe tallennettaessa sijoittelua."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "Sijoittelu poistettu onnistuneesti."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "Muokkaa sijoittelua"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "Muodon tyyppi."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/fi/OrchardCore.ProjectTemplates.po b/Localization/fi/OrchardCore.ProjectTemplates.po
index 3ae42a0fb4efb..1eb4227ab1d28 100644
--- a/Localization/fi/OrchardCore.ProjectTemplates.po
+++ b/Localization/fi/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Näytä"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/fi/OrchardCore.PublishLater.po b/Localization/fi/OrchardCore.PublishLater.po
index d16a3e4c41dd4..3a52daa08cc45 100644
--- a/Localization/fi/OrchardCore.PublishLater.po
+++ b/Localization/fi/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Julkaise myöhemmin"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Peruuta julkaisu myöhemmin"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/fi/OrchardCore.Queries.po b/Localization/fi/OrchardCore.Queries.po
index c6c01505a4af8..9fa113474db48 100644
--- a/Localization/fi/OrchardCore.Queries.po
+++ b/Localization/fi/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Suorita SQL-kysely"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "SQL-kyselyn suorittamisessa tapahtui virhe: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL-kysely"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "SQL-kysely käyttää standardia SQL92-syntaksia ja muunnetaan käytetyn tietokannan vaatimaan muotoon. Tauluille annetaan etuliitteet automaattisesti."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Hakulause"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Kyselyn tekninen nimi."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Jos valittuna, paluuarvona täytyy olla lista asiakirjojen Id: tä (document ids)."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/fi/OrchardCore.ReCaptcha.Core.po b/Localization/fi/OrchardCore.ReCaptcha.Core.po
index df9fcd487039d..ec83c3ecd8d8b 100644
--- a/Localization/fi/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/fi/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Ei voitu vahvistaa captchaa"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Ei voitu vahvistaa captchaa"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Kieltä nimellä {0} ei löydy"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/fi/OrchardCore.ReCaptcha.po b/Localization/fi/OrchardCore.ReCaptcha.po
index 167585f524360..d734c10e9abab 100644
--- a/Localization/fi/OrchardCore.ReCaptcha.po
+++ b/Localization/fi/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Vie ReCaptcha-asetukset."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Vahvista ReCaptcha-tehtävä"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validointi"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Kelvollinen"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Virheellinen"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Captcha-vahvistus epäonnistui. Yritä uudelleen."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Nykyinen ympäristö (tenant) ladataan uudelleen, kun asetukset on tallennettu."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Googlen reCaptchan sivuston avain."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/fi/OrchardCore.Recipes.Core.po b/Localization/fi/OrchardCore.Recipes.Core.po
index 0a13a599a52ae..b894af2d7d945 100644
--- a/Localization/fi/OrchardCore.Recipes.Core.po
+++ b/Localization/fi/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/fi/OrchardCore.Roles.po b/Localization/fi/OrchardCore.Roles.po
index f53e934ff157a..77bbb699f6dcf 100644
--- a/Localization/fi/OrchardCore.Roles.po
+++ b/Localization/fi/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Roolit"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Virheellinen roolin nimi."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rooli on päivitetty onnistuneesti."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Järjestelmärooleja ei voi poistaa."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Luo rooli"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Roolin nimi"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Muokkaa roolin tietoja"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Käyttöoikeus"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Tämä käyttöoikeus voi antaa käyttäjän muuttaa muita käyttöoikeuksiaan. Myönnä se äärimmäisellä harkinnalla."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Peruuta"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Roolit"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/fi/OrchardCore.Rules.po b/Localization/fi/OrchardCore.Rules.po
index 04923a13b9d01..126af293ffed7 100644
--- a/Localization/fi/OrchardCore.Rules.po
+++ b/Localization/fi/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-22 13:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Kaikki"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Lisää"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "Sisältötyyppi"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "Valitse sääntöoperaattori."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Kulttuuri"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Valitse ehto-operaattori."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr "Javaskripti"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "Rooli"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Valitse ehto-operaattori."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr "Url-osoite"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Valitse ehto-operaattori."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/fi/OrchardCore.Search.Elasticsearch.po b/Localization/fi/OrchardCore.Search.Elasticsearch.po
index acb11159062ee..375db7e439593 100644
--- a/Localization/fi/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/fi/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/fi/OrchardCore.Search.Lucene.po b/Localization/fi/OrchardCore.Search.Lucene.po
index 3aca11fce948d..42710508cdb81 100644
--- a/Localization/fi/OrchardCore.Search.Lucene.po
+++ b/Localization/fi/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/fi/OrchardCore.Search.po b/Localization/fi/OrchardCore.Search.po
index b9c117f1659e8..448867caebe77 100644
--- a/Localization/fi/OrchardCore.Search.po
+++ b/Localization/fi/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/fi/OrchardCore.Security.po b/Localization/fi/OrchardCore.Security.po
index c6faf87fb28a9..69fd8779f9eed 100644
--- a/Localization/fi/OrchardCore.Security.po
+++ b/Localization/fi/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-04-03 10:19\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/fi/OrchardCore.Seo.po b/Localization/fi/OrchardCore.Seo.po
index 67b22a70a0d9f..fa758ee49c6f7 100644
--- a/Localization/fi/OrchardCore.Seo.po
+++ b/Localization/fi/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "Näytetäänkö tämän sivun metatiedot."
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr "Ylikirjoittaa oletusarvoisen sivun otsikon. Suositus on alle 70 merkkiä."
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr "Tämän sivun metakuvaus."
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr "Sivun metaavainsanat, pilkulla erotettuna."
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr "Anna kanoninen URL-osoite, johon hakukoneet ohjataan tämän sivun sijaan. Yleensä ohjataan sivuun, jossa on rikkaampi sama sisältö."
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Muokkaa tietoja"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään sosiaali meta asetuksissa annettua Google skeemaa, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään sosiaali meta asetuksissa annettua Open Graph -tyyppiä, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään otsikkoa, sitten sivun otsikkoa, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr "Valitse näyttääksesi Googlen skeemapanelin."
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään otsikkoa, sitten sivun otsikkoa, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään metakuvausta, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään sosiaali meta asetuksissa annettua Twitter-korttia, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr "Oletusarvoisesti käytetään sosiaali meta asetuksissa annettua Twitter sisällön luojaa, tai voidaan ylikirjoittaa tässä."
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/fi/OrchardCore.Settings.po b/Localization/fi/OrchardCore.Settings.po
index 8fa07f431eb77..3744117bc6f36 100644
--- a/Localization/fi/OrchardCore.Settings.po
+++ b/Localization/fi/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Sivuston asetukset on päivitetty onnistuneesti."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr "Sivun koon on oltava suurempi kuin nolla."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr "Sivun koon on oltava pienempi tai yhtä suuri kuin {0}."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Pohja-url:n on täysin pätevä URL."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Sivuston asetukset"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/fi/OrchardCore.Setup.Core.po b/Localization/fi/OrchardCore.Setup.Core.po
index c30ee648b3295..e725d7b78d7ca 100644
--- a/Localization/fi/OrchardCore.Setup.Core.po
+++ b/Localization/fi/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr "Tietokannan tarjoajan asetus on pakollinen."
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr "Annettu tietokannan tarjoaja ei ole tuettu."
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "Annettu yhteysmerkkijono on virheellinen tai palvelin ei ole tavoitettavissa."
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "Annetut tietokannat, taulukon etuliite ja kaaviot ovat jo käytössä."
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/fi/OrchardCore.Setup.po b/Localization/fi/OrchardCore.Setup.po
index ede285bd3dcf8..b41ec57cdc355 100644
--- a/Localization/fi/OrchardCore.Setup.po
+++ b/Localization/fi/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Salasanassa on oltava vähintään {0} merkkiä."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Sivuston luominen ilman reseptiä ei ole mahdollista."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Tätä käytetään sivujesi oletusotsikkona."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Resepteillä voit alustaa sivustosi käyttämällä ennalta määritettyjä valintoja, ominaisuuksia ja asetuksia."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Määrittää oletusaikavyöhykkeen, jota käytetään näytettäessä ja muokattaessa päivämääriä ja kellonaikoja."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Tietokantaa käytetään sivuston konfiguraation ja sisällön tallentamiseen."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Voit määrittää tietokantataulujen etuliitteen, jos aiot käyttää samaa tietokantaa uudelleen useissa sivustoissa."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Näytä/piilota yhteysmerkkijono"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Pääkäyttäjällä on kaikki oikeudet. Käyttäjätunnusta tulisi käyttää vain asennuksen aikana sekä virhetilanteista toipumiseen."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Käyttäjänimi"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Sähköpostiosoite on virheellinen."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Salasanan vahvuus"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/fi/OrchardCore.Shortcodes.po b/Localization/fi/OrchardCore.Shortcodes.po
index 98ab2daceedc4..73eb0fa264f07 100644
--- a/Localization/fi/OrchardCore.Shortcodes.po
+++ b/Localization/fi/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Sisältö on pakollinen."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Malli ei sisällä validia Liquid-lauseketta. Tiedot: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Lyhytkoodimalli poistettu onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Lyhytkoodimallit poistettu onnistuneesti."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "Luo lyhytkoodi"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "Lyhytkoodin nimi."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "Lyhytkoodia koskeva vihje."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "Lyhytkoodin käyttöesimerkki."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "Tämän lyhytkoodin kategoriat."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "Muokkaa lyhytkoodia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "Lyhytkoodin nimi."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "Lyhytkoodia koskeva vihje."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "Esimerkki lyhytkoodin käytöstä."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "Tämän lyhytkoodin kategoriat."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/fi/OrchardCore.Sitemaps.po b/Localization/fi/OrchardCore.Sitemaps.po
index 6aaffe666a422..13a449035e0e2 100644
--- a/Localization/fi/OrchardCore.Sitemaps.po
+++ b/Localization/fi/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Sivuston asetuksien 'base url' on tyhjä, mutta se vaaditaan sivukarttojen luontiin."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Sivuston asetusten 'Pohja URL' -arvo on tyhjä, mutta se vaaditaan sivustokarttojen luomiseksi."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr "Sivukartan polku"
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr "Sivukarttaan lisättävä polku, esim. polku/johonkin"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Sivuston asetusten 'Pohja URL' -arvo on tyhjä, mutta se vaaditaan sivustokarttojen luomiseksi."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Sivuston asetusten 'Pohja URL' -arvo on tyhjä, mutta se vaaditaan sivustokarttojen luomiseksi."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Nimi"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Valitse, jos haluat jättää tämän sisältökohteen pois sivukartasta."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Tiheys, jolla tämä sisältökohde todennäköisesti muuttuu."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/fi/OrchardCore.Sms.po b/Localization/fi/OrchardCore.Sms.po
index d41eb29456e3f..2803087451822 100644
--- a/Localization/fi/OrchardCore.Sms.po
+++ b/Localization/fi/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/fi/OrchardCore.Spatial.po b/Localization/fi/OrchardCore.Spatial.po
index 30ac23116bc3b..6274473507528 100644
--- a/Localization/fi/OrchardCore.Spatial.po
+++ b/Localization/fi/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Tämä arvo on pakollinen."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fi/OrchardCore.Taxonomies.po b/Localization/fi/OrchardCore.Taxonomies.po
index 522edcae65831..ebbfe9c173f75 100644
--- a/Localization/fi/OrchardCore.Taxonomies.po
+++ b/Localization/fi/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Arvo vaaditaan kohteelle '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Taksonomia suodattimet"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Tunnisteet"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomia ei löytynyt. Ole hyvä ja tarkista tämän kentän asetukset."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Virhe luotaessa tagia"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Kirjoita hakeaksesi"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Valitse"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Poista"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Paina enter-näppäintä luodaksesi tagin"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Arvoja ei löydy"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Tunnisteet"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomia ei löytynyt. Ole hyvä ja tarkista tämän kentän asetukset."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tämän kentän vihjeteksti, joka näytetään editorissa."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taksonomia"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Pakollinen"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Kun vähintään yksi kohde on valittu."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Yksilöivä"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Kun vain yksi kohde on valittu."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Vain lehdet"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Kun lehdet on ainoita kohteita, jotka voidaan valita."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Jos on mahdollista luoda uusia tageja suoraan koodissa. Huom: Kun luodaan tageja koodissa, vain näytön teksti asetetaan."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Termin sisältötyyppi"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Lisää {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Olet uudelleenjärjestänyt taksonomian."
diff --git a/Localization/fi/OrchardCore.Templates.Cms.Module.po b/Localization/fi/OrchardCore.Templates.Cms.Module.po
index d9630d1a64174..6b10631079896 100644
--- a/Localization/fi/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/fi/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Näytä"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/fi/OrchardCore.Templates.po b/Localization/fi/OrchardCore.Templates.po
index af9a98b757763..a46c95c753f1d 100644
--- a/Localization/fi/OrchardCore.Templates.po
+++ b/Localization/fi/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Malli \"{0}\" on luotu."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Malli on poistettu onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Malli on siirretty onnistuneesti."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "Kaikki mallit"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Esikatselu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Mallin nimi."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Mallin kuvaus."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Esikatselu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Mallin nimi."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Mallin kuvaus."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/fi/OrchardCore.Tenants.po b/Localization/fi/OrchardCore.Tenants.po
index e21ef96dd5ef5..c165156b988f2 100644
--- a/Localization/fi/OrchardCore.Tenants.po
+++ b/Localization/fi/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Asiakkaat"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "Kaikki"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Kaikki tilat"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Käynnissä"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Pois käytöstä"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Alustamatta"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Nimi"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Tila"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Poista käytöstä"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Ota käyttöön"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Et voi poistaa oletusasiakasta käytöstä."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Asiakas '{0}' on jo poistettu käytöstä."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Asiakas '{0}' on jo käytössä."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Voit ottaa käyttöön vain käytöstä poistetun asiakkaan."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "Käyttäjänimi \"{0}\" on virheellinen. Se saa sisältää vain kirjaimia tai numeroita."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "Sähköpostiosoite on virheellinen."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Asiakasta ei löydy: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Asiakasta ei voi määrittää."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Tietokantayhteyksien tarjoajaa ei ole määritetty."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Yhteysmerkkijono vaaditaan tätä tietokantayhteyksien tarjoajaa varten."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Joko 'Recipe' tai 'RecipeName' vaaditaan."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Reseptiä '{0}' ei löytynyt."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr "Asiakkaan nimi on pakollinen."
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr "Ominaisuuden profiilia ei ole olemassa."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr "Virheellinen asiakkaan nimi. Nimi saa sisältää ainoastaan kirjaimia sekä numeroja."
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr "Isäntänimi ja URL-etuliite eivät voi olla tyhjiä samaan aikaan."
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr "URL-etuliite voi sisältää vain yhden segmentin."
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr "Asiakas, jolla on sama isäntänimi ja URL-etuliite, on jo olemassa."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr "Samanniminen asiakas on jo olemassa."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Luo asiakas"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Luo asiakas"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Valitse luotavan asiakkaan nimi."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Valinnainen) luotavan asiakkaan kuvaus."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Käytettävän tietokannan tyyppi?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tietokantataulujen etuliite"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Yhteysmerkkijono"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Resepti"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Poista asiakas käytöstä"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Muokkaa asiakasta"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Ota asiakas käyttöön"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Ota asiakas käyttöön."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Suunnittelu"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Alusta asiakas"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Valitse alustettavan asiakkaan nimi."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Sivuston nimi"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Ylläpitäjän käyttäjänimi"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Ylläpitäjän sähköposti"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Ylläpitäjän salasana"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Käytettävän tietokannan tyyppi?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tietokantataulujen etuliite"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Yhteysmerkkijono"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/fi/OrchardCore.Tests.po b/Localization/fi/OrchardCore.Tests.po
index 94a51846948d3..d2724c21878b4 100644
--- a/Localization/fi/OrchardCore.Tests.po
+++ b/Localization/fi/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-05-05 11:43\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr "Lisää tehtävä"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr "Testi"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr "Kirjoita rivitehtävä"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr "Testi"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr "Valmis"
diff --git a/Localization/fi/OrchardCore.Themes.po b/Localization/fi/OrchardCore.Themes.po
index cd3c554112c05..b0335fbebaf7d 100644
--- a/Localization/fi/OrchardCore.Themes.po
+++ b/Localization/fi/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Vie valitun sivuston ja sivuston ylläpidon teemat."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/fi/OrchardCore.Title.po b/Localization/fi/OrchardCore.Title.po
index e65fcaa59c475..16d73f5dfbe78 100644
--- a/Localization/fi/OrchardCore.Title.po
+++ b/Localization/fi/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Otsikko on täytettävä."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr "Otsikko on pakollinen."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Malli ei sisällä validia Liquid-lauseketta. Yksityiskohdat: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Otsikko generoidaan automaattisesti."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Valitse tämä ruutu, jos haluat näyttää otsikon näyttönäkymissä."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fi/OrchardCore.Twitter.po b/Localization/fi/OrchardCore.Twitter.po
index fc758601ca123..5b63c8efb5927 100644
--- a/Localization/fi/OrchardCore.Twitter.po
+++ b/Localization/fi/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Käyttöoikeustunnuksen salaisuus vaaditaan"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Päivitä Twitterin tila -tehtävä"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Sosiaalinen"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Epäonnistunut"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Nykyinen ympäristö (tenant) ladataan uudelleen, kun asetukset on tallennettu."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Katso käyttöohjeet"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "Asetuksen salauksen purussa tapahtui virhe. Ota käyttöön ja tallenna."
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Twitter-integraation asetukset"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API-avain"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "API-avain, joka on määritelty Avaimet ja tunnukset  -välilehdessä Twitter-sovelluksen kojelaudalla."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "API:n salainen avain"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "API-salaisuus, joka on määritelty Avaimet ja tunnukset  -välilehdessä Twitter-sovelluksen kojelaudalla."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Käyttöoikeustunnus"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "API-:n käyttöoikeusunnus, mikä on määritelty Avaimet ja tunnukset  -välilehdessä Twitter-sovelluksen kojelaudassa."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Käyttöoikeustunnuksen salaisuus"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "API-:n tunnuksen salaisuus Avaimet ja tunnukset  -välilehdellä Twitter-sovelluksen kojelaudassa."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Kirjaudu sisään Twitterillä - Asetukset"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Päivitä Twitterin tila"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/fi/OrchardCore.Users.Core.po b/Localization/fi/OrchardCore.Users.Core.po
index 1355164bfb678..522b610c71beb 100644
--- a/Localization/fi/OrchardCore.Users.Core.po
+++ b/Localization/fi/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Sähköpostiosoite \"{0}\" on virheellinen."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Odottamaton virhe: \"{0}\"."
diff --git a/Localization/fi/OrchardCore.Users.po b/Localization/fi/OrchardCore.Users.po
index 2e213261ca5d0..b092f7b757909 100644
--- a/Localization/fi/OrchardCore.Users.po
+++ b/Localization/fi/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Käyttäjä luotu onnistuneesti"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Paikallinen kirjautuminen ei ole käytössä."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Tili on lukittu. Liian monesta epäonnistuneesta kirjautumisyrityksestä tili lukitaan 5 minuutiksi."
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Virheellinen kirjautumisyritys."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Salasanasi on vaihdettu onnistuneesti."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Ulkoinen palveluntarjoaja palautti virheen."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Sivusto ei salli käyttäjien rekisteröitymistä."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Vahvista tilisi"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Tämä käyttäjä ei saa kirjautua sisään."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Sinun täytyy vahvistaa sähköpostiosoitteesi."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Kaikki käyttäjät"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Käytössä olevat käyttäjät"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Käytöstä poistetut käyttäjät"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nimi"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Sähköposti"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Hyväksy"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Ota käyttöön"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Poista käytöstä"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Poista"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Kaikki roolit"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Autentikoidut (ei rooleja)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Käyttäjä {0} on hyväksytty onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Käyttäjä {0} on poistettu onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Käyttäjä {0} onnistuneesti poistettu käytöstä."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Käyttäjä {0} on otettu onnistuneesti käyttöön."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Käyttäjä on luotu onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Käyttäjä on päivitetty onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Käyttäjä on poistettu onnistuneesti."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Käyttäjää ei voitu poistaa."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Salasana on päivitetty onnistuneesti."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Käyttäjän lukitus avattu onnistuneesti."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Käyttäjän lukituksen avaus ei onnistunut."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "Omia rooleja ei voi päivittää."
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Kirjautumisasetukset"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Vie kirjautumisasetukset."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Sähköpostin muutosasetukset"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Vie sähköpostin muutosasetukset."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Rekisteröitymisen asetukset"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Vie rekisteröitymisen asetukset."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Salasanan nollausasetukset"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Vie salasanan nollausasetukset."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Uusi salasana ja vahvistussalasana eivät täsmää."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Tehtävä määritä käyttäjäroolit"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Käyttäjä"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Epäonnistui"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Tehtävä rekisteröi käyttäjä"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Käyttäjä"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Kelvollinen"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Virheellinen"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Sähköpostipalvelua ei ole saatavilla"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Tapahtuma käyttäjä päivitetty"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Käyttäjä"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Tehtävä validoi käyttäjä"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonyymi"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Todentaminen"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Roolissa"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Arvo on pakollinen kohteelle {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} rooliin {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Liitettävä käyttäjä. Liquid-tuella."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Uusi salasana"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Luo käyttäjä"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Muokkaa salasanaa"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Uusi salasana"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Tarkista sähköpostisi asettaaksesi uuden salasanan."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Todennus onnistui palvelulla <strong> {0} </strong>. Sinulla on jo tili tällä sähköpostiosoitteella. Kirjoita paikallisen tilisi salasana ja napsauta Rekisteröi-painiketta linkittääksesi tilit ja viimeistelläksesi sisäänkirjautumisen."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Käytä toista palvelua kirjautuaksesi sisään"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Kirjaudu käyttäen tiliäsi {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Luo uusi tili."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "Sähköposti"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Salasana"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Autentikoituminen onnistui palvelulla <strong> {0} </strong>. Täytä alla oleva lomake ja napsauta Rekisteröidy-painiketta rekisteröinnin loppuunsaattamiseksi."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Salasana"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Lähetä vahvistusviesti"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Viestin aihe. Tukee Liquid-syntaksia."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Koti"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Aseta uusi salasana"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Uusi salasana"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Käyttäjä on poistettu käytöstä."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Käyttäjä on otettu käyttöön."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Poista valinta poistaaksesi käyttäjätilin käytöstä."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr "Käyttäjätunnus"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Määritä työnkulun \"UserName\" ominaisuus, jos käyttäjä on autentikoitunut"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Roolit"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Tulos \"InRole\" palautetaan, jos käyttäjällä on vähintään yksi valituista rooleista."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/fi/OrchardCore.Widgets.po b/Localization/fi/OrchardCore.Widgets.po
index b660e5befac27..398ec0cf39b62 100644
--- a/Localization/fi/OrchardCore.Widgets.po
+++ b/Localization/fi/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Lisää komponentti"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Standardi"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/fi/OrchardCore.Workflows.po b/Localization/fi/OrchardCore.Workflows.po
index d7d4da97a2087..8aa1785e0a132 100644
--- a/Localization/fi/OrchardCore.Workflows.po
+++ b/Localization/fi/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Tee tapahtuma tehtävä"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Korrelloi tehtävä"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Primitiivit"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Jokaiselle tehtävälle"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Iteroi"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Haarautuva tehtävä"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Silmukka tehtävä (For)"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Iteroi"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Ehdollinen tehtävä (If Else)"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Tosi"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Epätosi"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Yhdistä tehtävä"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Yhdistetty"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Loki tehtävä"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Primitiivit"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Valmis"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Poikkeustilanteet"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Ilmoitustehtävä"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Käyttöliittymä"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Skriptitehtävä"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Aseta tulostustehtävä"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Primitiivit"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Aseta ominaisuus tehtävä"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Primitiivit"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Silmukka (while)"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Toiminnonkulku"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Iteroi"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Valmis"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Toiminnan päivitys onnistui."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Äskettäin luodut"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Kauiten aikaa sitten luodut"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Epäonnistunut"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Valmis"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Poista"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Työnkulku {0} on poistettu."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Poista"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Työnkulku {0} on poistettu."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Työnkulku on talletettu."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Työnkulku {0} poistettu"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Http-uudelleenohjaus tehtävä"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Valmis"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Http-pyyntö tehtävä"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Valmis"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Osumat"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Http-pyyntö tehtävä"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Käsittelemätön HTTP-tilakoodi"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "HTTP-vastaus tehtävä"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Valmis"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Ei oikeutta käynnistää '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Aloitustehtävä"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Muokkaa"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Lisää"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Korreloi"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Takaisin"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Oletko varma, että haluat poistaa tämän työnkulun tehtävän?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Poista"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Käytettävissä olevat tapahtumat"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Saatavilla olevat tehtävät"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Oletko varma, että haluat poistaa tämän toiminteen?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Suodatin"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Käy kaikki läpi arvosta <em>{0}</em> arvoon <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Läpikäytävä lista. JavaScript-tuella."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Ei haaroja"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Käy <em>{0}</em> läpi arvosta <em>{1}</em> arvoon <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Aloitusarvo. Javascript-tuella."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Lopetusarvo. Javascript-tuella."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Silmukan askeleen koko. Javascript-tuella."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "HTTP uudelleenohjaus"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "Uudelleenohjauksen URL-osoite. Liquid-tuella."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Pysyvä"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Valitse, jos haluat pysyvän uudelleenohjauksen (301). Jätä valitsematta, jos haluat tilapäisen uudelleenohjauksen (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Käsittele tuleva HTTP-pyyntö"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Kuka tahansa, joka kutsuu tätä Url-osoitetta, voi käynnistää tämän työnkulun. Pidä osoite turvassa."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Tarkista väärennöksenestotokeni. (Antiforgery Token)"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Poista tämä valinta, jos pyyntö tulee palvelusta, joka kutsuu tätä Url-osoitetta webhookilla. Jos tätä URL-osoitetta pyydetään lomakkeesta, pidä tämä valinta valittuna, jotta varmistettaisiin, että lomakkeen arvoja ei ole peukaloitu."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Tokenin elinikä"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Paina <b>Luo uudelleen</b>-nappulaa tämän arvon muuttamisen jälkeen."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Tokenin vanheneminen päivinä. 0 arvolla tokeni ei vanhene koskaan"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Suodata tulevat HTTP-pyynnöt"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Haettava HTTP-metodi."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Haettava kontrollerin nimi."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Haettavan toiminteen nimi."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "Url-osoite, johon pyyntö lähetetään. Liquid-tuella."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "HTTP-metodi. Esimerkiksi: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Pyynnön sisällön tyyppi."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Sisältö, joka lähetetään POST, PUT tai PATCH pyynnön yhteydessä. Liquid-tuella."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Anna lisää HTTP-otsikoita, yksi per rivi. Esimerkiksi: \"Authorization: Bearer 123ABC\". Liquid-tuella."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP-vastaus"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "HTTP-tilakoodi, joka palautetaan. Koko lista tilakoodeista saatavissa <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">täältä</a>."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Vastauksen sisällön tyyppi."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Takaisin lähetettävä sisältö. Liquid-tuella."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Validoi <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Järjestä"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Oletko varma, että haluat poistaa tämän työnkulun tehtävän?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Poista"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Luotu {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Ei mitään esitettävää.</strong> Ei yhtään pysäytettyä työnkulkua tällä hetkellä."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Takaisin"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "valittu"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Pois käytöstä"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "Yksi instanssi"
-msgstr[1] "{0} instanssia"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Odotaa <strong>yhden</strong> sisään tulevan aktiviteetin, ennen kuin suoritus jatkuu yhdessä polussa."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Loki"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Lokin taso."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} Ilmoitus"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Ilmoitustyyppi."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Komentosarja"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Mahdolliset tulokset. Pilkulla erotettu lista."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Ulostulo kohteen {0} kautta"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Tuloksen kohteen nimi."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Aseta {0} ominaisuus"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Asetettava ominaisuus. Jos ominaisuutta ei ole olemassa, se lisätään."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Kun <em>{0}</em> käynnistetään"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr "<em>{0} </em>"
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Käyttäjätapahtumaa ei ole määritelty"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Anna yksi tai useampi pilkulla erotettua toiminnan nimeä."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Toista silmukkaa niin kauan, kun <em>{0}</em> on tosi"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Jatka niin kauan, kuin ehto on tosi."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/fi/TheAdmin.po b/Localization/fi/TheAdmin.po
index 4d7a3fb5fcc26..8fb86737a259c 100644
--- a/Localization/fi/TheAdmin.po
+++ b/Localization/fi/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Valoisa tila"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Tumma tila"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Vieraile sivustolla"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Avaa / sulje valikko"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Poista"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Haluatko varmasti poistaa tämän elementin?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Ok"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Peruuta"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/fi/TheAgencyTheme.po b/Localization/fi/TheAgencyTheme.po
index 13951f7b8db0a..68f25053e4e3f 100644
--- a/Localization/fi/TheAgencyTheme.po
+++ b/Localization/fi/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Ei tuloksia."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Pyytämääsi sivua ei löytynyt."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/fi/TheBlogTheme.po b/Localization/fi/TheBlogTheme.po
index 8bcb24f304208..7c06fb947b2a1 100644
--- a/Localization/fi/TheBlogTheme.po
+++ b/Localization/fi/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-02-18 20:26\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "{0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Ei tuloksia."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Sivua ei löydy"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/fi/TheTheme.po b/Localization/fi/TheTheme.po
index 761eaca7139f2..7ce789eb74e0c 100644
--- a/Localization/fi/TheTheme.po
+++ b/Localization/fi/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Tervetuloa Orchard Coreen. Sivusto on luotu onnistuneesti."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/fr/OrchardCore.Admin.po b/Localization/fr/OrchardCore.Admin.po
index dc90051439148..f9e8e53762d2b 100644
--- a/Localization/fr/OrchardCore.Admin.po
+++ b/Localization/fr/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Admin"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Paramètres d'administration"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exporte les paramètres d'administration."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Bienvenue dans Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "N'hésitez pas à naviguer dans le menu et à découvrir toutes ses possibilités."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Activer le mode sombre du thème admin"
+msgid "Enable theme toggler"
+msgstr "Activer le commutateur de thème"
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Si un mode sombre peut être affiché pour le thème admin."
+msgid "Whether or not to display a theme toggler."
+msgstr "Afficher/Masquer le commutateur de thème."
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Si les titres sont affichés dans la barre du haut."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Admin"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr "Visiter le site"
+
diff --git a/Localization/fr/OrchardCore.AdminDashboard.po b/Localization/fr/OrchardCore.AdminDashboard.po
index 6a75098f9669a..8857e9ccdae6f 100644
--- a/Localization/fr/OrchardCore.AdminDashboard.po
+++ b/Localization/fr/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:39\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Non"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Position"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Largeur"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/fr/OrchardCore.AdminMenu.po b/Localization/fr/OrchardCore.AdminMenu.po
index a4e66b52e7c43..8099aef69bfd0 100644
--- a/Localization/fr/OrchardCore.AdminMenu.po
+++ b/Localization/fr/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:20\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Créer un menu Admin {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nom"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Créer un noeud"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Modifier le menu Admin : {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Modifier le noeud"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "La priorité de ce lien à afficher comme actif au lieu d'un autre lorsque les deux pointent vers la même url. Le lien avec la plus haute valeur a le statut actif dans la navigation."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "L'ordre de position de ce lien dans le menu admin."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Lien"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Le texte du lien tel qu'il sera affiché dans l'arbre."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "L'url du lien. Un lien ne sera affiché que si lui ou l'un de leurs enfants ont une url. L'url sera relative à la racine de l'admin du site"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Choisir une icône"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Espace réservé"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Le texte de l'élément de menu tel qu'il sera affiché dans l'arbre."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Choisir"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Sélectionnez une icône à afficher lorsque cet élément de menu est au premier niveau."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Choisir une icône"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Permissions"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Saisir pour rechercher"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Sélectionner"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Supprimer"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Aucun résultat trouvé"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Les autorisations requises pour afficher ce lien de menu (facultatif)."
diff --git a/Localization/fr/OrchardCore.Alias.po b/Localization/fr/OrchardCore.Alias.po
index 3a89221885197..c15c1175c34cc 100644
--- a/Localization/fr/OrchardCore.Alias.po
+++ b/Localization/fr/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "Votre alias est déjà utilisé. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Le modèle ne contient pas d'expression Liquid valide. Détails : {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Laissez vide pour le re-générer."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "L'alias est généré et la saisie est désactivée"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fr/OrchardCore.ArchiveLater.po b/Localization/fr/OrchardCore.ArchiveLater.po
index ad7e3ff1b863a..1fdff50acbdc7 100644
--- a/Localization/fr/OrchardCore.ArchiveLater.po
+++ b/Localization/fr/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "Archiver plus tard"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "Annuler l'archivage ultérieur"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/fr/OrchardCore.AuditTrail.po b/Localization/fr/OrchardCore.AuditTrail.po
index 10b57eed9b11d..8be9f392b3efc 100644
--- a/Localization/fr/OrchardCore.AuditTrail.po
+++ b/Localization/fr/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Audit Trail"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Toutes les catégories"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Intervalle personnalisé"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Audit Trail"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Si la tâche de suppression est désactivée."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Le nombre de jours pendant lesquels un événement est retenu."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/fr/OrchardCore.Autoroute.po b/Localization/fr/OrchardCore.Autoroute.po
index 33c895e38e883..7f786f32d1733 100644
--- a/Localization/fr/OrchardCore.Autoroute.po
+++ b/Localization/fr/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Votre permalien est trop long. Le permalien ne peut être que de {0} caractères maximum."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Cochez cette case pour désactiver l'autoroute pour cet élément de contenu."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Cocher pour spécifier qu'un élément de contenu enfant sera acheminé vers un chemin absolu."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fr/OrchardCore.BackgroundTasks.po b/Localization/fr/OrchardCore.BackgroundTasks.po
index 5083801c95371..813995cca76d1 100644
--- a/Localization/fr/OrchardCore.BackgroundTasks.po
+++ b/Localization/fr/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-22 09:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Avancé"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "Titre"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "Description"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Valeur d'expiration de verrouillage invalide dans l'onglet avancé"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Ignoré s'il n'y a pas de fonction de verrouillage distribué activée."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/fr/OrchardCore.ContentFields.po b/Localization/fr/OrchardCore.ContentFields.po
index ad32a785470cf..562852a7287a0 100644
--- a/Localization/fr/OrchardCore.ContentFields.po
+++ b/Localization/fr/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:20\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Interrupteur (switch)"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Aucun élément de contenu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standard"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Non publiés"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Rechercher"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Sélectionner"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Supprimer"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Aucun résultat trouvé"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Si vous voulez permettre la sélection de plusieurs éléments."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Afficher tous les types de contenu"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "Tous les types de contenu de ces stéréotypes"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Les types de contenu à afficher. Choisissez-en au moins un."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Localisé"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editeur Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Saisir les options de l'éditeur, le langage est toujours défini à `html` lors de la sauvegarde."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentation pour les options"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Si l'url est utilisée quand elle est sélectionnée à partir d'insérer un média (par défaut, le Short Code est inséré)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentation pour les options"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "Url"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Texte du lien"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Si l'url est requise."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Utiliser l'url du lien"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Le texte d'indication à afficher pour l'url dans l'éditeur."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Le texte d'indication à afficher pour le texte du lien dans l'éditeur."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Une indication (placeholder) à afficher lorsque l'entrée de l'url est vide."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Une indication (placeholder) à afficher lorsque l'entrée du texte est vide."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Une url valide proposée lors de la création d'un élément de contenu."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Aucun élément de contenu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Standard"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Non publié"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Tapez pour rechercher"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Sélectionner"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Supprimer"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Aucun résultat trouvé"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Si vous voulez permettre la sélection de plusieurs éléments."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Les types de contenu à afficher. Choisissez-en au moins un."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Liste de cases à cocher"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Rechercher"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Sélectionner"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Supprimer"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Aucune valeur trouvée"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ", "
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Modifier les données"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Une représentation JSON des valeurs autorisées, par exemple {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Intervalle"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Aucun"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Spinner"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Une indication à afficher lorsque l'entrée est vide. (facultatif)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Le nombre de chiffres après le point décimal."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "La valeur minimale autorisée. (facultatif)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "La valeur maximale autorisée. (facultatif)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "Url"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "H6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Saisir les options de l'éditeur."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentation pour les options"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Modifier les données"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Une représentation JSON des valeurs autorisées, par ex. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr "La valeur par défaut. (facultatif)"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Pour les secondes, utilisez un diviseur de 60 par exemple '15', pour les millisecondes, un décimal égal à un diviseur de 1000 divisé par 1000, par exemple '0.250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Aucun·e utilisateur·rice."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Standard"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Non actif"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Saisir pour rechercher"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Sélectionner"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Supprimer"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Aucun résultat trouvé"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Si vous voulez permettre la sélection de plusieurs éléments."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Si on autorise au sélecteur d'afficher tous les types de contenu."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Obligatoire"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Indication"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Largeur"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "La largeur de la boîte vidéo"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Hauteur"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "La hauteur de la boîte vidéo"
diff --git a/Localization/fr/OrchardCore.ContentLocalization.po b/Localization/fr/OrchardCore.ContentLocalization.po
index db27fd963e22c..db2dcab92aaf8 100644
--- a/Localization/fr/OrchardCore.ContentLocalization.po
+++ b/Localization/fr/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Impossible de créer la version localisée de l'élément de contenu."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/fr/OrchardCore.ContentPreview.po b/Localization/fr/OrchardCore.ContentPreview.po
index c0730237629fa..21beaac1e549c 100644
--- a/Localization/fr/OrchardCore.ContentPreview.po
+++ b/Localization/fr/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Le modèle ne contient pas une expression Liquid valide. Détails: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Aperçu"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Aperçu déconnecté"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Erreur de l'aperçu"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fr/OrchardCore.ContentTypes.po b/Localization/fr/OrchardCore.ContentTypes.po
index 6a18db6394cfa..248b7b3314838 100644
--- a/Localization/fr/OrchardCore.ContentTypes.po
+++ b/Localization/fr/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-10 11:55\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Pièces de contenu"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Le nom d'affichage ne peut pas être vide."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Un type avec le même nom d'affichage existe déjà."
@@ -66,10 +66,10 @@ msgstr "Un type avec le même nom d'affichage existe déjà."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Le nom technique ne peut pas être vide."
@@ -78,10 +78,10 @@ msgstr "Le nom technique ne peut pas être vide."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Le nom technique doit commencer par une lettre."
@@ -90,10 +90,10 @@ msgstr "Le nom technique doit commencer par une lettre."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Le nom technique contient des caractères invalides."
@@ -101,133 +101,133 @@ msgstr "Le nom technique contient des caractères invalides."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "Le nom technique est réservé à un usage interne."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Un type avec le même nom technique existe déjà."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Le type de contenu \"{0}\" a été créé."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Les paramètres \"{0}\" ont été enregistrés."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" a été supprimé."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "La pièce \"{0}\" a été ajoutée."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Une pièce avec le même nom d'affichage existe déjà."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Une pièce avec le même nom technique existe déjà."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "La pièce \"{0}\" a été supprimée."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "La pièce de contenu n'a pas pu être créée."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "La pièce de contenu \"{0}\" a été créée."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Les paramètres de \"{0}\" ont été enregistrés."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "Il n'y a aucun champ."
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Un champ avec le même nom d'affichage existe déjà."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Un champ avec le même nom technique existe déjà."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Le champ \"{0}\" a été ajouté."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Nom d'affichage changé en ' {0}'."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Les paramètres du champ \"{0}\" ont été enregistrés."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Le champ \"{0}\" a été supprimé."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Les paramètres de la pièce \"{0}\" ont été enregistrés."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Le nom du type de contenu ne peut pas être vide."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Impossible d'ajouter la pièce nommée '{0}'. Elle existe déjà."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Ajouter un nouveau champ à \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nom du champ tel qu'il sera affiché sur les écrans."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Ajouter une pièce nommée à \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Nom de la pièce réutilisable telle qu'elle sera affichée sur les écrans."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Nom technique de la partie réutilisable."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Exporte les définitions de type de contenu et de pièces spécifiées à mettre à jour."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Nom technique de la pièce."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Nom de la pièce telle qu'elle sera affichée sur les écrans. Laisser vide pour utiliser la valeur par défaut."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Vérifier pour permettre à cette pièce d'être attachée plusieurs fois."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Nom technique du type."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nom du type tel qu'il sera affiché sur les écrans."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Nouveau type de contenu"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nom du type tel qu'il sera affiché sur les écrans."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Nouvelle pièce de contenu"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Créer"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Une liste de définitions de type de contenu séparées par des virgules à supprimer"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Exporte les définitions de type et de pièces de contenu spécifiées à supprimer."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Modifier la pièce de contenu - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Champs"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Modifier"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Supprimer"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Mode d'affichage"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "Éditeur"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Ajouter un champ"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Pièces"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Contient les champs pour le type actuel"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Ajouter des pièces"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Ajouter une pièce nommée"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Enregistrer"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Supprimer"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "Paramètres \"{0}\" pour \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nom du champ tel qu'il sera affiché sur les écrans."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Nom technique du champ."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Quel type d'éditeur doit être utilisé ?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Quel type de mode d'affichage doit être utilisé ?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Enregistrer"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Annuler"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Certains paramètres de pièce communs à tous les types peuvent également être définis au niveau de la <a href=\"{0}\">définition de la pièce</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Nom de la pièce tel qu'il sera affiché sur les écrans."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "La description de la pièce telle qu'elle sera affichée dans les écrans."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Quel type d'éditeur doit être utilisé ?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Quel type de mode d'affichage doit être utilisé ?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Enregistrer"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Annuler"
diff --git a/Localization/fr/OrchardCore.Contents.po b/Localization/fr/OrchardCore.Contents.po
index a32fce3c952be..cac1ff91fd218 100644
--- a/Localization/fr/OrchardCore.Contents.po
+++ b/Localization/fr/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Le•a {0} a été dépublié•e."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Tous les types de contenu"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Une ou plusieurs erreurs de validation se sont produites."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Exporte les paramètres d'Audit Trail relatifs au contenu."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Contenu"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Terminé"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Audit Trail"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Si le commentaire d'Audit Trail est affiché lors de l'édition."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "La date à laquelle l'élément de contenu a été créé ou publié pour la première fois."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "Cochez cette case pour pouvoir modifier le propriétaire de l'élément de contenu. La permission <code>EditContentOwner</code> sera également requise."
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "et continuer"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Actions"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tous les types de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tout type de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Contenu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tout type de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Le brouillon du contenu a été sauvegardé."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Eléments de contenu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tout type de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Afficher tous les types de contenu"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Choisir une icône"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Afficher tous les types de contenu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Limite la quantité d'éléments de contenu à fournir à partir de cette source. Remarque : Un seul type de contenu est sélectionnable lorsque cette option est sélectionnée."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "La fréquence par défaut avec laquelle ces types de contenu sont susceptibles de changer."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tous les types de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tout type de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tout type de contenu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Créer un contenu"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Cocher si vous voulez que l'élément de contenu soit publié lors de la création. Laisser décoché pour créer un brouillon."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Supprimer le contenu en utilisant l'expression : <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Voir le brouillon en JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Télécharger le brouillon en JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Voir la version publiée en JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Télécharger la version publiée en JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Voir en JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Aucun contenu à exporter pour le déploiement des plans cibles n'a été trouvé. Créez un plan de déploiement et ajoutez-y une Step Export de contenu vers cible de deploiement."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Contenu"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Nouveau"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publier le contenu en utilisant l'expression : <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Récupérer le contenu en utilisant l'expression : <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Dépublier le contenu en utilisant l'expression : <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Mettre à jour le contenu en utilisant l'expression : <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Entrez une expression JavaScript qui évalue à l'ID de l'élément de contenu (ContentItemId) à mettre à jour. Par exemple: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/fr/OrchardCore.CustomSettings.po b/Localization/fr/OrchardCore.CustomSettings.po
index 94cc02c07a6e5..6cb5043b053ec 100644
--- a/Localization/fr/OrchardCore.CustomSettings.po
+++ b/Localization/fr/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Paramètres personnalisés"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/fr/OrchardCore.Data.YesSql.po b/Localization/fr/OrchardCore.Data.YesSql.po
index ff040ce4a68d6..2d71073862ec8 100644
--- a/Localization/fr/OrchardCore.Data.YesSql.po
+++ b/Localization/fr/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "Impossible de supprimer les tables."
diff --git a/Localization/fr/OrchardCore.Demo.po b/Localization/fr/OrchardCore.Demo.po
index 813db8eca5153..72df55fc8c0f6 100644
--- a/Localization/fr/OrchardCore.Demo.po
+++ b/Localization/fr/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr "dd MMMM yyyy"
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Prénom"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Nom"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/fr/OrchardCore.Deployment.Remote.po b/Localization/fr/OrchardCore.Deployment.Remote.po
index b9590f5faae8f..9747790fac169 100644
--- a/Localization/fr/OrchardCore.Deployment.Remote.po
+++ b/Localization/fr/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Envoie le plan de déploiement vers une instance distante."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Nom du client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Créer une instance distante"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Nom du client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Modifier le client distant"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Nom du client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Modifier l'instance distante"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Nom du client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/fr/OrchardCore.Deployment.po b/Localization/fr/OrchardCore.Deployment.po
index 70ba5e4357833..0e0bbaca3904f 100644
--- a/Localization/fr/OrchardCore.Deployment.po
+++ b/Localization/fr/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Import JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Les plans de déploiement ont été supprimés avec succès."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Le nom est obligatoire."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Un plan de déploiement avec le même nom existe déjà."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Plan de déploiement mis à jour avec succès."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Plan de déploiement supprimé avec succès."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Créer un plan de déploiement"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Le fichier personnalisé à ajouter dans le plan."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Le nom de fichier tel qu'il sera ajouté dans l'archive."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Plans de déploiement"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Modifier le plan de déploiement"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "Recette JSON"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Le fichier de recette à ajouter dans le plan."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Nom de la recette."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Le nom d'affichage de la recette."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Description de la recette."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "L'auteur de la recette."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Le site web de la recette."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "La version de la recette."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Les catégories de la recette (valeurs séparées par des virgules)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/fr/OrchardCore.Diagnostics.po b/Localization/fr/OrchardCore.Diagnostics.po
index 8b0c510e04e7b..3004e68cdf5f1 100644
--- a/Localization/fr/OrchardCore.Diagnostics.po
+++ b/Localization/fr/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr "Votre navigateur a envoyé une demande que ce serveur n'a pas pu comprendre."
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Une erreur s'est produite lors de l'exécution de cette requête."
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr "Vous n'avez pas accès à cette ressource."
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr "La page n'a pu être trouvée."
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr "Vous n'êtes pas autorisé à voir ce contenu."
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr "Une erreur s'est produite lors de l'exécution de cette requête."
+
diff --git a/Localization/fr/OrchardCore.Email.Abstractions.po b/Localization/fr/OrchardCore.Email.Abstractions.po
index 2bacede9280d5..e63409b6eef2a 100644
--- a/Localization/fr/OrchardCore.Email.Abstractions.po
+++ b/Localization/fr/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Le champ {0} est requis."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "La méthode de livraison '{0}' n'est pas prise en charge."
diff --git a/Localization/fr/OrchardCore.Email.po b/Localization/fr/OrchardCore.Email.po
index 5fff10cf5c752..4c00397d4fe94 100644
--- a/Localization/fr/OrchardCore.Email.po
+++ b/Localization/fr/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:53\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Email invalide."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Tâche Email"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Messagerie"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Echec"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Envoyer Email"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "L'adresse e-mail de l'auteur qui définit l'origine de l'email. Laissez vide pour utiliser l'adresse e-mail configurée. Supporte la syntaxe Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "L'adresse e-mail de l'expéditeur. Requis si différente de l'adresse email \"From\". Supporte la syntaxe Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "L'adresse email \"Répondre à\". Requis si vous voulez envoyer des réponses par e-mail à une adresse différente de l'adresse \"From\". Avec le support de Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "La liste séparée par des virgules des adresses e-mail du destinataire. Avec support de Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "La liste séparée par des virgules des adresses e-mail de copie carbone. Supporte la syntaxe Liquid."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "La liste séparée par des virgules des adresses e-mail en Bcc. Supporte la syntaxe Liquid."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Si coché, indique que le corps du message sera envoyé en HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Paramètres"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "À"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "L'expéditeur est optionnel, il est utile lorsque l'auteur de l'e-mail est différent de celui qui envoie l'email."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Cci"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Cc"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Répondre à"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Objet"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Message"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Le locataire actuel sera rechargé lorsque les paramètres seront sauvegardés."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "L'adresse email par défaut à utiliser comme expéditeur, à moins que l'expéditeur du courriel soit défini."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Options de livraison réseau"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Le domaine du serveur SMTP, par exemple <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Le port du serveur SMTP, généralement 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Le serveur proxy est optionnel."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "Le port proxy est optionnel."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Lorsque cette option est sélectionnée, l’identité de l'application pool ou du processus hôte est utilisée pour s’authentifier auprès du serveur de messagerie."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Le nom d’utilisateur pour l’authentification."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Options de livraison du répertoire spécifié"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Par exemple <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> pour placer des courriels dans un répertoire <i>PickedUpEmail</i> sur le lecteur C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr "Ignorer le certificat SSL invalide"
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr "Ignore la vérification du certificat SSL s'il est invalide."
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/fr/OrchardCore.Facebook.po b/Localization/fr/OrchardCore.Facebook.po
index aa33389192fde..53b55a0589baf 100644
--- a/Localization/fr/OrchardCore.Facebook.po
+++ b/Localization/fr/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Le Body FaceBook ne contient pas une expression Liquid valide. Détails: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Le corps ne contient pas une expression Liquide valide. Détails: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Paramètres de connexion"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Le chemin de la requête dans le chemin de base de l'application où l'utilisateur-agent sera retourné. Le middleware va traiter cette requête lorsqu'elle arrive."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr "<a href=\"{0}\">Les paramètres d'intégration de Meta</a> doivent être configurés pour utiliser la fonctionnalité de connexion"
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr "Le Pixel ID du portail Meta."
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Le modèle du plugin, au format Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr "Meta Integration"
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr "L'ID d'application trouvé dans les paramètres du portail de développement Meta."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr "La clé secrète de l'application trouvée dans les paramètres du portail de développement Meta."
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Version SDK Javascript"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Init sur chaque page"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/fr/OrchardCore.Features.po b/Localization/fr/OrchardCore.Features.po
index 1c865f9742b95..f387c53dc633b 100644
--- a/Localization/fr/OrchardCore.Features.po
+++ b/Localization/fr/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Fonctionnalités "
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Veuillez sélectionner une ou plusieurs fonctionnalités."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "Cette fonctionnalité est toujours activée et ne peut pas être désactivée."
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} a été {1}."
@@ -125,9 +125,9 @@ msgstr "Action par lot"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Désactiver"
@@ -136,8 +136,8 @@ msgstr "Désactiver"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Activer"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Non catégorisé"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "Cette fonctionnalité est automatiquement activée en fonction de la dépendance et ne peut pas être désactivée manuellement."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "Cette fonctionnalité est automatiquement désactivée en fonction de la dépendance et ne peut pas être activée manuellement."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "Cette fonctionnalité est toujours activée et ne peut pas être désactivée manuellement."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Désactiver la fonction {0} désactivera également les fonctionnalités dépendantes suivantes:{1}Continuer?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Désactiver la fonctionnalité"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Oui"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Non"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Rien ici !</strong> Votre recherche n'a pas retourné de résultats."
diff --git a/Localization/fr/OrchardCore.Flows.po b/Localization/fr/OrchardCore.Flows.po
index 03c896ae86fa3..13ce95372c7c9 100644
--- a/Localization/fr/OrchardCore.Flows.po
+++ b/Localization/fr/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr "L'élément de contenu du Widget avec l'id {0} ne correspond pas à la définition du type de contenu {1}."
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Ajouter un élément"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Les types de contenu que ce Bag peut contenir, par exemple un Slide pour un Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr "Les stéréotypes des types de contenu que ce bag peut contenir. Vous pouvez définir plusieurs stéréotypes en utilisant la virgule (,) comme séparateur"
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Insérer un widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Êtes-vous sûr de vouloir supprimer cet élément ?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "Aucun widget trouvé."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/fr/OrchardCore.Forms.po b/Localization/fr/OrchardCore.Forms.po
index cc8eb391f8bce..7b0db881865ec 100644
--- a/Localization/fr/OrchardCore.Forms.po
+++ b/Localization/fr/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr "Tâche de redirection Http vers l'emplacement du formulaire"
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr "HTTP"
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr "Terminé"
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr "Echec"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Les options sont écrites dans un format incorrect."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Ajouter une tâche Erreur de validation du formulaire"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validation"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Tâche Bind Model State"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validation"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Tâche valider le jeton d'Antiforgery"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validation"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Valide"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Invalide"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Tâche valider le champ du formulaire"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validation"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Valide"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Invalide"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Tâche valider le formulaire"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validation"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Valide"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Invalide"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr "<em>{0}</em>: <em>{1}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Le nom du champ de formulaire qui a une valeur invalide."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Lie les champs de formulaire soumis à l'état du modèle."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Texte affiché sur le bouton."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Le type de bouton."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr "Le type de label à créer pour ce champ."
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr "Le texte à afficher dans le label."
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "L'ID à afficher sur cet élément de formulaire."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr "Le type de validation à créer pour ce champ."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Le nom à afficher sur cet élément de formulaire."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "L'URL à laquelle soumettre le formulaire."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "La méthode HTTP à utiliser lors de l'envoi du formulaire."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Cocher pour générer un jeton de contrefaçon dans le formulaire."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr "Enregistrer l'emplacement du formulaire"
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr "Cocher pour stocker l'emplacement actuel du formulaire. Cet emplacement stocké pourra ultérieurement être utilisé pour renvoyer l'utilisateur à son emplacement initial."
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr "Tâche de redirection Http vers l'emplacement du formulaire"
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr "Clé pour l'emplacement du formulaire"
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr "Cette valeur doit correspondre à la valeur de la clé d'emplacement de formulaire utilisée dans les paramètres d'événement de requête HTTP. Laisser vide si le workflow gère un seul événement de formulaire."
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr "Redirection HTTP vers l'emplacement du formulaire"
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr "Rediriger l'agent utilisateur vers l'emplacement original du formulaire."
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Le type de bouton."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Le texte à afficher lorsque le champ n'a pas de valeur."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Valeur par défaut pour ce champ."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Modifier les données"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Une représentation JSON des valeurs autorisées, par exemple {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr "Le style de l'éditeur à utiliser pour ce champ."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Le texte à afficher lorsque le champ n'a pas de valeur."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Valider <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Le nom du champ de formulaire à valider."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Vérifie si le formulaire soumis contient des erreurs de validation."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/fr/OrchardCore.GitHub.po b/Localization/fr/OrchardCore.GitHub.po
index f6e52d0fc3cfa..eb9d7de5c913f 100644
--- a/Localization/fr/OrchardCore.GitHub.po
+++ b/Localization/fr/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Paramètres d'authentification GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Le Client ID définit dans l'onglet général de votre <a target=\"_blank\" href=\"https://github.com/settings/apps\">Application GitHub</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Le Client secret de votre application."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/fr/OrchardCore.Google.po b/Localization/fr/OrchardCore.Google.po
index 26f4ace15c251..9d0bb33897422 100644
--- a/Localization/fr/OrchardCore.Google.po
+++ b/Localization/fr/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Paramètres Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Paramètres d'authentification Google"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "L'id client défini dans la console Google API pour l'application."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Le client secret défini dans la console Google API pour l'application."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr "Paramètres Google Tag Manager"
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/fr/OrchardCore.Html.po b/Localization/fr/OrchardCore.Html.po
index fff5790c220fc..a4f191733fde1 100644
--- a/Localization/fr/OrchardCore.Html.po
+++ b/Localization/fr/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editeur Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Le corps de l'élément de contenu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Saisir les options de l'éditeur, le langage est toujours défini à `html` lors de la sauvegarde."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentation pour les options"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Si l'url est utilisée quand elle est sélectionnée à partir d'insérer un média (par défaut, le Short Code est inséré)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Entrer les options de l'éditeur"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentation pour les options"
diff --git a/Localization/fr/OrchardCore.Https.po b/Localization/fr/OrchardCore.Https.po
index 110221f4d8775..d7d38a8c2fe31 100644
--- a/Localization/fr/OrchardCore.Https.po
+++ b/Localization/fr/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Spécifie si une redirection permanente, 308 Moved Permanently, doit être utilisée au lieu d'une redirection temporaire, 307 Found, lors de la redirection vers HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/fr/OrchardCore.Infrastructure.Abstractions.po b/Localization/fr/OrchardCore.Infrastructure.Abstractions.po
index 62583356639f2..8c6a56901d42c 100644
--- a/Localization/fr/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/fr/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2022-03-05 10:48\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "Le switch \"{0}\" n'a pas été trouvé"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Une propriété \"{0}\" existe mais n'a pas été décorée avec \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Erreur lors de la conversion de la valeur \"{0}\" à \"{1}\" pour le switch \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Les arguments de commande \"{0}\" ne correspondent pas à la définition de la commande"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "La méthode \"{0}\" ne prend pas en charge le switch \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr "Adresse email invalide."
+
diff --git a/Localization/fr/OrchardCore.Layers.po b/Localization/fr/OrchardCore.Layers.po
index 5b000a2e8c685..8e1c56091504a 100644
--- a/Localization/fr/OrchardCore.Layers.po
+++ b/Localization/fr/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -50,7 +50,7 @@ msgstr "L'élément de contenu du Widget avec l'id {0} ne correspond pas à la d
 #: OrchardCore.Layers\Controllers\AdminController.cs:276
 msgctxt "OrchardCore.Layers.Controllers.AdminController"
 msgid "Layer deleted successfully."
-msgstr "Couche supprimée avec succès."
+msgstr "Layer supprimée avec succès."
 
 #. await _notifier.ErrorAsync(H["The layer couldn't be deleted: you must remove any associated widgets first."]);
 #: OrchardCore.Layers\Controllers\AdminController.cs:280
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Créer une layer"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Description"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Modifier Layer - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "Erreur lors de la mise à jour de l'ordre des règles"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Modifier les Widgets et les Layers"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget déplacé avec succès. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Annuler</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zones"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Veuillez <a href=\"{0}\">définir les zones disponibles</a> avant d'ajouter des widgets"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Ajouter un Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "Aucun widget trouvé."
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "Aucune layer trouvée."
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Layers"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
-msgstr "Sélectionnez une couche pour révéler ses widgets associés."
+msgstr "Sélectionnez une layer pour révéler ses widgets associés."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Voir la documentation"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Modifier"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
-msgstr "Veuillez <a href=\"{0}\">créer une couche</a> avant d'ajouter des Widgets"
+msgstr "Veuillez <a href=\"{0}\">créer une layer</a> avant d'ajouter des Widgets"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Ajouter"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Si coché, le titre sera rendu avec le widget."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
-msgstr "La couche avec laquelle le widget doit être associé."
+msgstr "La layer avec laquelle le widget doit être associé."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/fr/OrchardCore.Liquid.po b/Localization/fr/OrchardCore.Liquid.po
index 0965dfcf9e61a..4a3657f55e170 100644
--- a/Localization/fr/OrchardCore.Liquid.po
+++ b/Localization/fr/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Le Liquid Body ne contient pas une expression Liquid valide. Détails: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/fr/OrchardCore.Lists.po b/Localization/fr/OrchardCore.Lists.po
index 7e8eaa62cc6c8..bdac18ba61d97 100644
--- a/Localization/fr/OrchardCore.Lists.po
+++ b/Localization/fr/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Représente un lien vers l'élément de contenu parent, et l'ordre où l'élément de contenu est représenté."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Représente une collection d'éléments de contenu."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Le Blog Post spécifié n'existe plus. Veuillez créer un nouveau blog Post."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Non autorisé à supprimer ce contenu"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Le nom d'utilisateur ou l'email ou le mot de passe fourni est incorrect."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "La liste est vide"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "Désactiver la génération de liens de flux RSS."
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Le flux actuel est disponible sur <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "Nouveau"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Cocher cette option pour activer l'ordonnancement manuel des éléments."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Listes"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Ajouter un menu parent"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/fr/OrchardCore.Localization.po b/Localization/fr/OrchardCore.Localization.po
index 87e2f18c5ee98..59a490259e63c 100644
--- a/Localization/fr/OrchardCore.Localization.po
+++ b/Localization/fr/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Cultures"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Une culture est nécessaire"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Le site a été redémarré pour que les paramètres prennent effet."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Les cultures actives configurées pour le site."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Paramètres de culture"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Exporte les paramètres de culture."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Ajouter une culture"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/fr/OrchardCore.Markdown.po b/Localization/fr/OrchardCore.Markdown.po
index d6426cbf2cd63..5970d545aca2c 100644
--- a/Localization/fr/OrchardCore.Markdown.po
+++ b/Localization/fr/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} ne contient pas une expression Liquid valide. Détails: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editeur Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Le corps de l’élément de contenu, au format Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editeur Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fr/OrchardCore.Media.po b/Localization/fr/OrchardCore.Media.po
index f861b5d2d9f58..371b0882232ab 100644
--- a/Localization/fr/OrchardCore.Media.po
+++ b/Localization/fr/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Impossible de déplacer le média car un fichier existe déjà avec le même nom"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Un profil du même nom existe déjà."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Profil média supprimé avec succès."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Les profils médias ont été supprimés avec succès."
@@ -181,95 +181,95 @@ msgstr "Les profils médias ont été supprimés avec succès."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Par défaut"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Taille personnalisée"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Par défaut (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Max"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Crop"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Pad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "BoxPad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Min"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Stretch"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Une erreur est survenue lors de la gestion des fichiers."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Pour obtenir les ressources du répertoire supérieur ou de tous les sous-répertoires."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Créer un profil média"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Le nom du profil média."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "L'indication du profil média."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Sélectionnez la largeur de l'image traitée. Une valeur par défaut signifie qu'une commande de largeur ne sera pas appliquée."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Sélectionnez la hauteur de l'image traitée. Une valeur par défaut signifie qu'une commande de hauteur ne sera pas appliquée."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Sélectionnez le mode de redimensionnement de l'image traitée."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Sélectionnez la couleur de fond pour l'image traitée. Une valeur vide signifie que la commande bgcolor ne sera pas appliquée. Exemples de valeurs valides: 'white', 'ffff00', 'ff0080', '128,64,32' et '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Sélectionnez le format pour l'image traitée. Une valeur par défaut signifie qu'une commande de format ne sera pas appliquée."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Modifier le profil média"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Le nom du profil média."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "L'indication du profil média."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Sélectionnez la largeur de l'image traitée. Une valeur par défaut signifie qu'une commande de largeur ne sera pas appliquée."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Sélectionnez la hauteur de l'image traitée. Une valeur par défaut signifie qu'une commande de hauteur ne sera pas appliquée."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Sélectionnez le mode de redimensionnement de l'image traitée."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Sélectionnez la couleur de fond pour l'image traitée. Une valeur vide signifie que la commande bgcolor ne sera pas appliquée. Exemples de valeurs valides: 'white', 'ffff00', 'ff0080', '128,64,32' et '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Sélectionnez le format pour l'image traitée. Une valeur par défaut signifie qu'une commande de format ne sera pas appliquée."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Inverser"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Créer un Dossier"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Renommer l'élément"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Médias"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Exporte tous les médias ou ceux spécifiés."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Petites miniatures"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Grandes miniatures"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} Ko)"
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr "Ce fichier dépasse la taille maximale de téléchargement"
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr "Téléchargements"
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr "Erreurs"
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr "Effacer les erreurs"
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Attaché"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Petites miniatures"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Grandes miniatures"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} Ko)"
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Sélectionner un média"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "OK"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Si la sélection d'un point d'ancrage pour le redimensionnement est autorisée."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fr/OrchardCore.Menu.po b/Localization/fr/OrchardCore.Menu.po
index 853be749c4c59..ede0e11dfe2f6 100644
--- a/Localization/fr/OrchardCore.Menu.po
+++ b/Localization/fr/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menus"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Élément de menu supprimé avec succès."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "La publication de cet élément de contenu peut effacer le contenu créé. Corriger les problèmes de type de contenu au préalable."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Modifier {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Voir la documentation"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/fr/OrchardCore.Microsoft.Authentication.po b/Localization/fr/OrchardCore.Microsoft.Authentication.po
index e59925a377fbd..b167ac7cbd2f6 100644
--- a/Localization/fr/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/fr/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Paramètres d'authentification du compte Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "L'ID de l'application trouvée dans les paramètres du portail développeur Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "La clé secrète de l'application trouvée dans les paramètres du portail développeur Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr "Paramètres d'authentification Microsoft Entra ID"
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr "Le nom d'affichage du fournisseur."
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr "L'ID de l'application trouvé dans les paramètres d'enregistrement de l'application Microsoft Entra ID."
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr "L'ID du Tenant (Directory) trouvé dans les paramètres d'enregistrement de l'application Microsoft Entra ID."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/fr/OrchardCore.Navigation.po b/Localization/fr/OrchardCore.Navigation.po
index 49016abf0785e..3b2f3c7fa76e2 100644
--- a/Localization/fr/OrchardCore.Navigation.po
+++ b/Localization/fr/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/fr/OrchardCore.Notifications.po b/Localization/fr/OrchardCore.Notifications.po
index 15ac176013326..7a0e065548c50 100644
--- a/Localization/fr/OrchardCore.Notifications.po
+++ b/Localization/fr/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr "Tâche pour notifier le propriétaire du contenu"
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr "Tâche pour notifier un utilisateur"
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "Notifications"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr "Terminé"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr "Echoué"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr "Échec: aucun utilisateur trouvé"
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr "Lus"
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr "Non lus"
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr "Créé récemment"
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr "Créé précédemment"
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "Marquer comme non lu"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr "Supprimer"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] "notification"
 msgstr[1] "notifications"
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr "{0} {1} marqué comme non lu avec succès."
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr "{0} {1} marqué comme lu avec succès."
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr "{0} {1} supprimé avec succès."
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr "Marquer comme lu"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr "Aucune notification trouvée."
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr "sélectionné(s)"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] "1 élément"
 msgstr[1] "{0} éléments"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr "Éléments {0} à {1}"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "Supprimer"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
-msgstr "Notifier l'utilisateur"
+msgid "Notify Content Owner"
+msgstr "Notifier le propriétaire du contenu"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "Vous pouvez utiliser la syntaxe Liquid."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "Ce corps de texte optionnel ne supporte pas le HTML. Vous pouvez utiliser la syntaxe Liquid."
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,11 +378,11 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "Si cette case est cochée, le fournisseur de notification utilisera le corps HTML s'il supporte le HTML."
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
-msgstr "Notifier le propriétaire"
+msgid "Notify Content Owner"
+msgstr "Notifier le propriétaire du contenu"
 
 #. <p>@T["Notify content owner"]</p>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:2
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr "Notifier l'utilisateur"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "Vous pouvez utiliser la syntaxe Liquid."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "Ce corps de texte optionnel ne supporte pas le HTML. Vous pouvez utiliser la syntaxe Liquid."
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "Si cette case est cochée, le fournisseur de notification utilisera le corps HTML s'il supporte le HTML."
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] "notification"
-msgstr[1] "notifications"
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr "Vous avez plus de {0} {1} non-lus"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr "Vous avez plus de {0} notifications non lues"
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr "Vous avez {0} {1} non lus"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] "Vous avez {1} notification non lue"
+msgstr[1] "Vous avez {0} notification non lue"
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
-msgstr "Vous n'avez pas de notifications non lues"
+msgstr "Vous n'avez aucune notification non lue"
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr "Centre de notifications"
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/fr/OrchardCore.OpenId.po b/Localization/fr/OrchardCore.OpenId.po
index 724813f3cfab9..1ed01c8ad854b 100644
--- a/Localization/fr/OrchardCore.OpenId.po
+++ b/Localization/fr/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Le nom est déjà pris par une autre portée (scope)."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Configuration du serveur OpenID mise à jour avec succès."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Configuration de validation OpenID mise à jour avec succès."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Créer une nouvelle application"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Id du client"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Nom d'affichage"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Les applications confidentielles doivent envoyer leur secret client lors de la communication avec les points de terminaison de token et de révocation. Cela garantit que seul le client légitime peut échanger un code d'autorisation ou obtenir un jeton de rafraîchissement."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Autoriser le Refresh Token Flow"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Autoriser le point de terminaison Logout"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr "Assurez-vous que l'application client et la bibliothèque OAuth ou OIDC utilisée prennent en charge PKCE avant d'activer cette option."
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Créer une nouvelle portée"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Nom d'affichage"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Note : le tenant serveur est toujours inclus dans le jeton d'accès, même si aucune portée n'est demandée."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Modifier une application"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Id du client"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Nom d'affichage"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Les applications confidentielles doivent envoyer leur secret client lors de la communication avec les points de terminaison de token et de révocation. Cela garantit que seul le client légitime peut échanger un code d'autorisation ou obtenir un jeton de rafraîchissement."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Client Secret"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Autoriser le Refresh Token Flow"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr "Assurez-vous que la bibliothèque client/client prend en charge PKCE avant d'activer cette option."
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Modifier une portée"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Nom d'affichage"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Note : le tenant serveur est toujours inclus dans le jeton d'accès, même si aucune portée n'est demandée."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Le locataire actuel sera rechargé lorsque les paramètres seront sauvegardés."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Nom d'affichage de l'IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Autorité à utiliser lors des appels OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "le 'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Le chemin de la requête dans le chemin de base de l'application où l'utilisateur-agent sera retourné. Le middleware va traiter cette requête lorsqu'elle arrive."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Voir post_logout_redirect_uri de "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "L'uri vers laquelle l'agent utilisateur sera redirigé une fois que l'application sera déconnectée du fournisseur d'identité. La redirection aura lieu après l'invocation du SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Flux d'authentication Code"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "voir: "
@@ -1217,15 +1217,15 @@ msgstr "Utiliser le type de réponse 'code'"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "exemple :"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Utiliser le type de réponse 'code token'"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Flux d'authentification Implicite"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Utiliser le type de réponse 'id_token'"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Utiliser le type de réponse 'id_token token'"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Mode de réponse"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Configurer le mode de réponse, voir : http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Client Secret"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "définir le client secret."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr "Nom du paramètre"
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr "Valeur"
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr "Supprimer le paramètre de la liste"
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr "Ajouter un paramètre"
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr "Modifier les données"
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr "Paramètres"
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Une représentation JSON des valeurs autorisées, par exemple {0}"
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "OK"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr "Paramètres avancés"
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr "Paramètres avancés qui peuvent être envoyés avec la demande d'autorisation."
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Ces options sont toutes facultatives et sont uniquement destinées aux utilisateurs avancés."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "L'URL de base du serveur d'identité (ce site). Si aucune n'est fournie, une valeur par défaut basée sur l'hôte du site est automatiquement calculée."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "Sélectionnez l'emplacement du certificat de chiffrement."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "Sélectionnez le magasin d'encryptage de certificats."
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Vous devez ajouter un certificat à votre serveur pour configurer le module OpenID Connect."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "Sélectionnez l'emplacement du certificat de signature."
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "Sélectionnez le magasin de signature de certificats."
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "Lorsque cette option est activée, les jetons d'actualisation ne sont pas marqués comme redeemed et peuvent être réutilisés jusqu'à leur expiration."
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Le locataire actuel sera rechargé lorsque les paramètres seront sauvegardés."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Tenant serveur d'autorisation"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "L'adresse du serveur OpenID Connect distant. L'utilisation d'une adresse HTTPS est fortement recommandée."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr "La well-formed URI du point de terminaison d'adresse de métadonnées OpenID Connect. Ceci est uniquement pour les scénarios avancés lorsque les métadonnées ne sont pas disponibles à partir du point de terminaison de l'autorité standard. Il ne peut pas être utilisé lors de l'utilisation d'un tenant et l'utilisation d'une adresse HTTPS est fortement recommandée."
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/fr/OrchardCore.Placements.po b/Localization/fr/OrchardCore.Placements.po
index 2fd6d36bb57a1..509205d223cf9 100644
--- a/Localization/fr/OrchardCore.Placements.po
+++ b/Localization/fr/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "Les règles de placement pour \"{0}\" existent déjà. Veuillez modifier la règle existante."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "Les paramètres de la pièce \"{0}\" ont été enregistrés."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "Le placement \"{0}\" est vide."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "Le placement \"{0}\" a été supprimé."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "Une erreur est survenue lors de l'analyse du placement<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "Une erreur s'est produite lors de l'enregistrement du placement."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "Placements supprimés avec succès."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "Modifier le placement"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "Le type de shape."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/fr/OrchardCore.ProjectTemplates.po b/Localization/fr/OrchardCore.ProjectTemplates.po
index 558de84d6cd42..c1270a6dd268b 100644
--- a/Localization/fr/OrchardCore.ProjectTemplates.po
+++ b/Localization/fr/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Afficher"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/fr/OrchardCore.PublishLater.po b/Localization/fr/OrchardCore.PublishLater.po
index 4e7985df35e09..cf0b654eb54ca 100644
--- a/Localization/fr/OrchardCore.PublishLater.po
+++ b/Localization/fr/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publier plus tard"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Annuler la publication ultérieure"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/fr/OrchardCore.Queries.po b/Localization/fr/OrchardCore.Queries.po
index 4dd63c2094395..c0b29a38f9efa 100644
--- a/Localization/fr/OrchardCore.Queries.po
+++ b/Localization/fr/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Requête SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Une erreur est survenue lors de l'exécution de la requête SQL: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "Requête SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "La requête SQL utilise la syntaxe SQL92 standard et est convertie en fonction de la base de données réelle. Les tableaux seront préfixés automatiquement."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Requête"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Le nom technique de la requête."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr "Si cette case est cochée, vous devrez déclarer manuellement les variables pour les références d'élément de contenu telles que les champs de sélecteur de contenu, Champs de taxonomie, champs de balises et identifiants d'élément de liste et remplacez-les si nécessaire dans la recette. Toute référence à ces éléments de contenu sera perdue."
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr "Note: La requête doit être configurée pour retourner des documents."
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Lorsque coché, le résultat doit être une liste d'ids de document."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/fr/OrchardCore.ReCaptcha.Core.po b/Localization/fr/OrchardCore.ReCaptcha.Core.po
index 820cf29cb8486..925915d9c5605 100644
--- a/Localization/fr/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/fr/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Impossible de valider le captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Impossible de valider le captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Langue avec le nom {0} introuvable"
+msgid "Failed to validate ReCaptcha"
+msgstr "Échec de la validation du ReCaptcha"
 
diff --git a/Localization/fr/OrchardCore.ReCaptcha.po b/Localization/fr/OrchardCore.ReCaptcha.po
index 8e2c3f31344e3..ac3e09a21b353 100644
--- a/Localization/fr/OrchardCore.ReCaptcha.po
+++ b/Localization/fr/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Exporte les paramètres ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Tâche valider le ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validation"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Valide"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Invalide"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "La validation du Captcha a échoué. Réessayez."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Le locataire actuel sera rechargé lorsque les paramètres seront sauvegardés."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "La clé du site de Vvtre Google reCaptcha."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/fr/OrchardCore.Recipes.Core.po b/Localization/fr/OrchardCore.Recipes.Core.po
index f52353179de8e..f54563c0d3cbb 100644
--- a/Localization/fr/OrchardCore.Recipes.Core.po
+++ b/Localization/fr/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/fr/OrchardCore.Roles.po b/Localization/fr/OrchardCore.Roles.po
index 6c14a77dd9fc5..b1cb583cadb62 100644
--- a/Localization/fr/OrchardCore.Roles.po
+++ b/Localization/fr/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Rôles"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Nom d’utilisateur non valide."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rôle mis à jour avec succès."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Impossible de supprimer des rôles système."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr "Tâche pour obtenir les utilisateurs par rôle"
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr "Utilisateur"
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr "Terminé"
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr "Echec"
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr "Tâche assigner le rôle à l'utilisateur"
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr "Utilisateur"
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr "Terminé"
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr "Echec"
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Créer un Rôle"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Nom de rôle"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Modifier les détails du rôle"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Permission"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Cette permission pourrait permettre à un utilisateur d'augmenter ses autres permissions. Accordez-la avec une extrême précaution."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr "Obtenir des utilisateurs dans les rôles"
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr "Obtenir des utilisateurs dans les rôles {0} à {1}"
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr "Nom de la clé de sortie"
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr "Le nom de clé désigné pour stocker la liste des utilisateurs dans la sortie du workflow. Cette clé permet d'accéder plus tard à la liste dans le workflow. Supporte la syntaxe Liquid."
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr "Rôles"
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr "Choisissez les rôles utilisés pour identifier les utilisateurs lors de la génération de la liste."
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr "Obtenir des utilisateurs dans les rôles"
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr "Obtenir des utilisateurs dans les rôles."
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Rôles"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr "Retirer l'utilisateur des rôles"
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr "Retirer {0} des rôles {1}"
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr "Nom d'utilisateur"
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr "L'utilisateur à assigner. Supporte la syntaxe Liquid."
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr "Rôles"
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr "Les rôles à supprimer."
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr "Retirer l'utilisateur des rôles"
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr "Retirer un utilisateur de rôles."
+
diff --git a/Localization/fr/OrchardCore.Rules.po b/Localization/fr/OrchardCore.Rules.po
index 28f180cf06e2f..1aabfbc92765f 100644
--- a/Localization/fr/OrchardCore.Rules.po
+++ b/Localization/fr/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Toutes"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Tout"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Ajouter"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "Type de contenu"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "Sélectionnez l'opérateur de règle."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Culture"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Sélectionnez l'opérateur de règle."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr "Javascript"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "Rôle"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Sélectionnez l'opérateur de règle."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Sélectionnez l'opérateur de condition."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/fr/OrchardCore.Search.Elasticsearch.po b/Localization/fr/OrchardCore.Search.Elasticsearch.po
index a15a2a2b5c6b2..50e261876ed84 100644
--- a/Localization/fr/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/fr/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,127 +56,127 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr "Elasticsearch"
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr "Réinitialiser "
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr "Reconstruire"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr "Supprimer"
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr "Un index nommé {0} existe déjà."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "Un index nommé {0} n'existe pas."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "Une erreur s'est produite lors de la création de l'index."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "Index <em>{0}</em> créé avec succès."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr "Une erreur s'est produite lors de la modification."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr "L'index <em>{0}</em> a été modifié avec succès, <strong>veuillez envisager de reconstruire l'index.</strong>"
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "Index <em>{0}</em> réinitialisé avec succès."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "Index <em>{0}</em> reconstruit avec succès."
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr "Index introuvable sur le serveur Elasticsearch."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "Index <em>{0}</em> supprimé avec succès."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "Une erreur s'est produite lors de la suppression de l'index."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Requête invalide : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr "Indices supprimés avec succès."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
-msgstr "Au moins une sélection de type de contenu est nécessaire."
+msgid "At least one content type is required."
+msgstr "Au moins un type de contenu est requis."
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr "Le nom de l'index est requis."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
-msgstr "Le nom de l'index contient des caractères non autorisés."
+msgid "The index name contains forbidden characters."
+msgstr "Le nom de l'index contient des caractères interdits."
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
 #: OrchardCore.Search.Elasticsearch\Drivers\ElasticQueryDisplayDriver.cs:65
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr "Le champ d'index est requis"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr "Requête Multi-Match (par défaut)"
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr "Requête de chaîne de requête"
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr "Requête personnalisée"
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr "Veuillez fournir la requête par défaut."
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr "La requête fournie n'est pas formatée correctement."
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr "Requête invalide fournie."
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr "Modifier l'index Elasticsearch"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr "Voir la documentation"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr "Sélectionnez un analyseur"
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr "La culture de contenu qu'il indexera."
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr "Les types de contenu à indexer. Choisissez-en au moins un."
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr "Reconstruire les Indices Elasticsearch"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr "Exécuter"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr "Cochez cette case pour retourner les éléments de contenu correspondants."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,53 +572,53 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr "Requête Elasticsearch"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
+msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
+msgstr "Aucun indice n'existe ! Veuillez créer au moins un index pour configurer le service Elasticsearch."
+
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
 msgid "Default search index"
 msgstr "Index de recherche par défaut"
 
 #. <span class="hint">@T["The default index to use for the search page."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
 msgid "The default index to use for the search page."
 msgstr "L'index par défaut à utiliser pour la page de recherche."
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
-msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
-msgstr "Vous devez créer au moins un index pour le définir comme index de recherche."
-
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
-msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
-msgstr "Champs recherchés par défaut"
-
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
-msgstr "Une liste de champs séparés par des virgules à utiliser pour les pages de recherche. La valeur par défaut est <code>Content.ContentItem.FullText</code>."
+msgid "Default search type"
+msgstr "Type de recherche par défaut"
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
-msgstr "Autoriser Elasticsearch \"query string query\" dans les formulaires de recherche"
+msgid "Default query"
+msgstr "Requête par défaut"
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
-msgstr "Si les requêtes de recherche doivent être autorisées à utiliser la syntaxe <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\"</a>."
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
+msgstr "Créer une requête Elasticsearch personnalisée à utiliser pour chaque requête de recherche. Supporte la syntaxe Liquid, donc utilisez le modèle <code>{0}</code> pour remplacer le terme de recherche fourni par l'utilisateur."
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
-msgstr "Voir la documentation"
+msgid "Default searched fields"
+msgstr "Champs recherchés par défaut"
+
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
+msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
+msgstr "Une liste de champs séparés par des virgules à utiliser pour les pages de recherche. La valeur par défaut est <code>{0}</code>."
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticSettingsDeploymentStep.Fields.Edit.cshtml:3
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr "Mappages de l'index Elasticsearch"
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr "Requête Elasticsearch"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr "L'index Elasticsearch sur lequel rechercher"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr "La requête de recherche utilise le format Elasticsearch. Certaines documentations peuvent être trouvées ici <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/fr/elasticsearch/reference/current/query-dsl.html</a>"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/fr/OrchardCore.Search.Lucene.po b/Localization/fr/OrchardCore.Search.Lucene.po
index 56281c1ad9d43..15806298ca627 100644
--- a/Localization/fr/OrchardCore.Search.Lucene.po
+++ b/Localization/fr/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr "Lucene"
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr "Réinitialiser "
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr "Reconstruire"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr "Toutes les cultures"
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr "Un index nommé {0} existe déjà."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "Un index nommé {0} n'existe pas."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "Une erreur s'est produite lors de la création de l'index."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "Index <em>{0}</em> créé avec succès."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr "Une erreur s'est produite lors de la modification de l'index."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr "L'index <em>{0}</em> a été modifié avec succès, <strong>veuillez envisager de reconstruire l'index.</strong>"
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "Index <em>{0}</em> réinitialisé avec succès."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "Index <em>{0}</em> reconstruit avec succès."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "Index <em>{0}</em> supprimé avec succès."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "Une erreur s'est produite lors de la suppression de l'index."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Requête invalide : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr "Indices supprimés avec succès."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr "Au moins une sélection de type de contenu est nécessaire."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr "Le nom de l'index est requis."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr "Le nom de l'index contient des caractères non autorisés."
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr "Lucene"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr "Modifier l'index Lucene"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr "Nom de l'index"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr "Nom de l'Analyseur"
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr "La culture de contenu qu'il indexera."
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr "Les types de contenu à indexer. Choisissez au moins un."
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr "Index de recherche Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr "Reconstruire les indices de recherche Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr "Réinitialiser les indices de recherche Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tous"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr "Exécuter"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr "Cocher cette case pour retourner les éléments de contenu correspondants."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr "Requête Lucene"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr "Vous devez créer au moins un index pour le définir comme index de recherche."
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr "Requête Lucene"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr "L'index lucene dans lequel rechercher"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr "La requête de recherche utilise le format Elasticsearch. De la documentation peut être trouvée ici <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/fr/elasticsearch/reference/current/query-dsl.html</a>"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr "Créer"
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr "Les résultats affichés proviennent des champs stockés dans Lucene."
diff --git a/Localization/fr/OrchardCore.Search.po b/Localization/fr/OrchardCore.Search.po
index 5c397ccd90b01..d037b55c41f2e 100644
--- a/Localization/fr/OrchardCore.Search.po
+++ b/Localization/fr/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr "Rechercher"
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr "Le texte à utiliser dans la barre de recherche."
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr "Laissez vide pour utiliser l'index par défaut."
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr "Le fournisseur de recherche par défaut à utiliser pour la page de recherche."
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/fr/OrchardCore.Security.po b/Localization/fr/OrchardCore.Security.po
index ba9ca4bddaea9..8ef475a455bf0 100644
--- a/Localization/fr/OrchardCore.Security.po
+++ b/Localization/fr/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr "Les paramètres actuels proviennent des sources de configuration, l'enregistrement des paramètres affectera les AdminSettings et non la configuration."
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr "Permet aux administrateurs de contrôler les ressources que l'agent utilisateur est autorisé à charger pour une page donnée."
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr "Permet à un site de contrôler quelles fonctionnalités et API peuvent être utilisées dans le navigateur."
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/fr/OrchardCore.Seo.po b/Localization/fr/OrchardCore.Seo.po
index 7ee6d93200ff3..4f196ad253227 100644
--- a/Localization/fr/OrchardCore.Seo.po
+++ b/Localization/fr/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-15 22:13\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr "Ajouter une règle pour interdire les robots web aux routes administratives."
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "Afficher ou non les métadonnées de cette page."
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr "Remplacer le titre par défaut de la page du navigateur web généré (recommandé à moins de 70 caractères)."
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr "La méta description à afficher pour cette page."
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr "Les méta keywords à afficher pour cette page, séparés par des virgules."
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr "Remplace l'Url canonique par défaut."
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Modifier les données"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr "La meta Google Schema à utiliser."
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr "Le type Open Graph à utiliser."
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Le titre est utilisé par défaut, puis le titre de la page, ou peut être remplacé ici."
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr "Cochez cette case pour afficher la saisie des informations Google Schema."
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Le titre est utilisé par défaut, puis le titre de la page, ou peut être remplacé ici."
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr "La Meta Description à utiliser."
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr "La Twitter Card à utiliser."
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr "Le Twitter Creator à utiliser."
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/fr/OrchardCore.Settings.po b/Localization/fr/OrchardCore.Settings.po
index 4d9319e665ae7..8504fac17dfb9 100644
--- a/Localization/fr/OrchardCore.Settings.po
+++ b/Localization/fr/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Paramètres du site mis à jour avec succès."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr "La taille de la page doit être supérieure à zéro."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr "La taille de la page doit être inférieure ou égale à {0}."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "L'url de base doit être une URL entièrement qualifiée."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr "Paramètres des caches dynamiques"
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr "Si un CDN de framework est utilisé pour les scripts enregistrés et les feuilles de style, tels que jQuery, ou leur version locale"
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr "Une URL CDN de base préfixée aux scripts locaux et aux feuilles de style. Il est désactivé si la valeur est vide ou si le mode de débogage des ressources est activé, par exemple <em>https://cdn.mysite.com</em>"
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr "Détermine si les scripts et les feuilles de style se chargent dans leur forme déboggable ou minifiée."
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr "Le nom du site."
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr "Le format par défaut des titres de page."
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr "Entrez l’URL de base complète du site web."
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr "Détermine le fuseau horaire par défaut utilisé lors de l'affichage et de l'édition des dates et des heures. Le DST (heure d'été du jour) sera appliqué automatiquement par fuseau horaire si disponible."
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Paramètres du Site"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/fr/OrchardCore.Setup.Core.po b/Localization/fr/OrchardCore.Setup.Core.po
index 136e90601c3c2..6cf0e9dcae434 100644
--- a/Localization/fr/OrchardCore.Setup.Core.po
+++ b/Localization/fr/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr "Le paramètre Fournisseur de base de données est requis."
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr "Le fournisseur de base de données renseigné n'est pas pris en charge."
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "La chaîne de connexion fournie est invalide ou le serveur est inaccessible."
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "La base de données fournie, le préfixe de table et le schéma sont déjà utilisés."
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/fr/OrchardCore.Setup.po b/Localization/fr/OrchardCore.Setup.po
index bd002d0c3c936..6307c0a9c5c8c 100644
--- a/Localization/fr/OrchardCore.Setup.po
+++ b/Localization/fr/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Le mot de passe doit contenir au minimum {0} caractères."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Il n’est pas possible de configurer un site sans une recette."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Il sera utilisé comme titre par défaut de vos pages."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Les recettes vous permettent de configurer votre site avec des options supplémentaires pré-paramétrées, des fonctionnalités et des paramètres par défaut."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Détermine le fuseau horaire par défaut utilisé lors de l’affichage et la modification des dates et des heures."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "La base de données est utilisée pour stocker la configuration du site et son contenu."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Vous pouvez spécifier un préfixe de table si vous avez l'intention de réutiliser la même base de données pour plusieurs sites."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Afficher/masquer la chaîne de connexion"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Le super utilisateur possède tous les droits. Il doit être utilisé uniquement lors de l’installation et pour la récupération d’urgence."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Nom d’utilisateur"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "L’email est invalide."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Robustesse du mot de passe"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/fr/OrchardCore.Shortcodes.po b/Localization/fr/OrchardCore.Shortcodes.po
index a0295a873f5ab..a2332b19bc0eb 100644
--- a/Localization/fr/OrchardCore.Shortcodes.po
+++ b/Localization/fr/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Le contenu du modèle est obligatoire."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Le modèle ne contient pas d'expression Liquid valide. Détails : {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Modèle de Shortcode supprimé avec succès."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Les modèles de Shortcode ont été supprimés avec succès."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "Créer un Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "Le nom du shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "L'indication pour le shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "Exemple d'utilisation du shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "Les catégories de ce shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "La valeur par défaut du shortcode lorsqu'il est sélectionné. Par défaut, [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "Modifier le Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "Le nom du shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "L'indication pour le shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "Exemple d'utilisation du shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "Les catégories de ce shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "La valeur par défaut du shortcode lorsqu'il est sélectionné. Par défaut, [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/fr/OrchardCore.Sitemaps.po b/Localization/fr/OrchardCore.Sitemaps.po
index d6b35b2c6183b..1e75b859eed72 100644
--- a/Localization/fr/OrchardCore.Sitemaps.po
+++ b/Localization/fr/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le paramètre du site 'Url de base' est vide, mais est requis pour générer des sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le paramètre du site 'Url de base' est vide, mais est requis pour générer des sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Décocher pour désactiver le routage vers l'index sitemap."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr "Chemin d'accès personnalisé au plan du site"
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr "Le chemin à ajouter au plan du site. Par exemple chemin/vers"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr "La fréquence par défaut avec laquelle ces types de contenu sont susceptibles de changer."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le paramètre du site 'Url de base' est vide, mais est requis pour générer des sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le paramètre du site 'Url de base' est vide, mais est requis pour générer des sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Nom"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Décocher pour désactiver le routage vers l'index sitemap."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Cochez cette case pour exclure cet élément de contenu de sitemap."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "La fréquence de cet élément de contenu est susceptible de changer."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/fr/OrchardCore.Sms.po b/Localization/fr/OrchardCore.Sms.po
index fda3070268170..0a0956a740a57 100644
--- a/Localization/fr/OrchardCore.Sms.po
+++ b/Localization/fr/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-21 15:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr "Tâche SMS"
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr "SMS"
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr "Envoyer un SMS"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr "Le numéro de téléphone doit inclure un code de pays. Par exemple, +33 pour la France."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr "Informations sur le compte Twilio"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr "Le numéro de téléphone doit inclure un code de pays. Par exemple, +33 pour la France."
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr "SID du compte"
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr "Jeton d'authentification"
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
-msgstr "Le jeton d'authentification a été enregistré en toute sécurité. Entrez une nouvelle valeur si vous souhaitez remplacer le secret existant."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
+msgstr "Le jeton d'authentification a été enregistré de manière sécurisée. Entrez une nouvelle valeur si vous souhaitez remplacer le secret existant."
 
diff --git a/Localization/fr/OrchardCore.Spatial.po b/Localization/fr/OrchardCore.Spatial.po
index 0055e8ec40189..1676448c91056 100644
--- a/Localization/fr/OrchardCore.Spatial.po
+++ b/Localization/fr/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr "Le champ {0} est requis."
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr "Latitude"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "Éditeur Leaflet"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr "Latitude"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Si une valeur est requise."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/fr/OrchardCore.Taxonomies.po b/Localization/fr/OrchardCore.Taxonomies.po
index 414cc3a086cff..a867eff9491d3 100644
--- a/Localization/fr/OrchardCore.Taxonomies.po
+++ b/Localization/fr/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Une valeur est requise pour '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr "Le champ Type de contenu de terme est requis."
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Filtres de taxonomie"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Tags"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "La taxonomie est introuvable. Veuillez vérifier les paramètres de ce champ."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Erreur lors de la création du tag"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Saisir pour rechercher"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Sélectionner"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Supprimer"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Appuyer sur Entrée pour créer un tag"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Aucun tag trouvé"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Tags"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "La taxonomie n'a pas pu être trouvée. Veuillez vérifier les paramètres de ce champ."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Le texte d'indication à afficher pour ce champ dans l'éditeur."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonomie"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr "Sélectionner la taxonomie"
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Obligatoire"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Si au moins un élément doit être sélectionné."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unique"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Si un seul élément peut être sélectionné."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Feuilles uniquement"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Si les éléments de dernier niveau sont les seuls qui peuvent être sélectionnés."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Si de nouveaux tags peuvent être créés à la volée. Note: Lors de la création de tags, seule la propriété d'affichage du terme de texte sera définie."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Type de contenu terme"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr "Sélectionnez un type de contenu de terme"
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Ajouter {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Vous avez réorganisé la taxonomie."
diff --git a/Localization/fr/OrchardCore.Templates.Cms.Module.po b/Localization/fr/OrchardCore.Templates.Cms.Module.po
index 5f56426a92595..6381b4fd41a24 100644
--- a/Localization/fr/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/fr/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Afficher"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/fr/OrchardCore.Templates.po b/Localization/fr/OrchardCore.Templates.po
index 5b91c7325c805..072e77cd4c481 100644
--- a/Localization/fr/OrchardCore.Templates.po
+++ b/Localization/fr/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Le modèle \"{0}\" a été créé."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Modèle supprimé avec succès."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Modèles supprimés avec succès."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "Tous les modèles"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Aperçu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Le nom du modèle."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "La description du modèle."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Aperçu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Le nom du modèle."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "La description du modèle."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/fr/OrchardCore.Tenants.po b/Localization/fr/OrchardCore.Tenants.po
index 20a3f06835843..651722ecc57bf 100644
--- a/Localization/fr/OrchardCore.Tenants.po
+++ b/Localization/fr/OrchardCore.Tenants.po
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
 msgctxt "OrchardCore.Tenants.AdminMenu"
 msgid "Multi-Tenancy"
-msgstr "Multi-Tenancy"
+msgstr "Multi-Location"
 
 #. .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
 #. .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Tenants"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "Tous"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Tous les états"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "En cours"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Désactivé"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Non initialisé"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Nom"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Etat"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Désactiver"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Activer"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Vous ne pouvez pas désactiver le tenant par défaut."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Le tenant '{0}' est déjà désactivé."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Le tenant '{0}' est déjà activé."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr "Vous ne pouvez désactiver qu'un tenant en cours d'exécution."
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Vous ne pouvez activer qu'un tenant désactivé."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr "Vous ne pouvez supprimer qu'un tenant 'Désactivé' ou 'Non initialisé'."
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr "Une erreur s'est produite lors de la suppression du tenant '{0}'. {1}"
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr "Le tenant '{0}' a été supprimé, consultez le fichier journal pour plus d'informations."
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr "Vous ne pouvez désactiver qu'un tenant en cours d'exécution."
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Vous ne pouvez activer qu'un tenant désactivé."
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr "Vous ne pouvez supprimer qu'un tenant 'Désactivé' ou 'Non initialisé'."
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr "Une erreur s'est produite lors de la suppression du tenant '{0}'."
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "Le nom d'utilisateur '{0}' n'est pas valide, ne peut contenir que des lettres ou des chiffres."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "L’email est invalide."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Tenant non trouvé : '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Le tenant ne peut pas être configuré."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Le fournisseur de base de données n'est pas défini."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr "Le fournisseur de base de données n'est pas pris en charge."
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "La chaîne de connexion est obligatoire pour ce fournisseur."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Soit 'Recipe' soit 'RecipeName' est requis."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr "Un fichier 'recette' ou un 'Nom de recette' est requis."
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Recette '{0}' introuvable."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr "Profils de fonctionnalités"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr "Le nom du tenant est obligatoire."
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr "Le profil de fonctionnalité n'existe pas."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr "Nom du tenant invalide. Ne doit contenir que des caractères et aucun espace."
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr "Le préfixe d'hôte et d'url ne peuvent pas être vide en même temps."
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr "Le préfixe d’url ne peut pas contenir plus d’un segment."
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr "Un tenant avec le même hôte et préfixe existe déjà."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr "Le nom du tenant est en conflit avec le tenant par défaut."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr "Un tenant ayant le même nom existe déjà."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr "Le tenant existant à valider n'a pas été trouvé."
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr "Le fournisseur de base de données renseigné n'est pas pris en charge."
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "La chaîne de connexion fournie est invalide ou le serveur est inaccessible."
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr "Le fichier de base de données associé est déjà utilisé."
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "La base de données fournie, le préfixe de table et le schéma sont déjà utilisés."
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr "Spécifier quels paramètres prédéfinis doivent être utilisés pour la configuration de l’installation."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr "La chaîne de connexion à votre instance de base de données, par exemple {0}."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr "Préfixe de table"
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr "Chaîne de connexion"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr "Spécifiez optionnellement quel profil de fonctionnalité doit être appliqué à ce tenant."
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr "La catégorie du tenant."
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr "(Optionnel) Exemple: Si le préfixe est \"site1\", l'URL du tenant sera \"https://orchardcore.net/site1\"."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr "La description du tenant."
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Créer un tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Créer un Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Sélectionnez le nom du tenant à créer."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Facultatif) la description du tenant à créer."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr "(Optionnel) Exemple: Si le préfixe est \"site1\", le préfixe URL du tenant est \"http://orchardproject.net/site1\"."
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Exemple : Si l'hôte est \"orchardproject.net\", l'URL du site tenant est \"http://orchardproject.net/\"."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Quel type de base de données utiliser ?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Préfixe de table"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Chaîne de connexion"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "Par exemple, '{0}' pour le serveur SQL."
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Recette"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Désactiver le Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Modifier le tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Activer le Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Activer un Tenant."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr "Le nom du profil de fonctionnalité."
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr "Invalide"
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Design"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Configurer un Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Sélectionner le nom du tenant à configurer."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Nom du site"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Nom de l'administrateur"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Email admin"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Mot de passe admin"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Quel type de base de données utiliser ?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Préfixe de table"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Chaîne de connexion"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "Par exemple, '{0}' pour le serveur SQL."
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/fr/OrchardCore.Tests.po b/Localization/fr/OrchardCore.Tests.po
index 558ba8a1e27fe..03cfd7c2e22c0 100644
--- a/Localization/fr/OrchardCore.Tests.po
+++ b/Localization/fr/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr "Ajouter une tâche"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr "Test"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr "Tâche écrire une ligne"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr "Test"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr "Terminé"
diff --git a/Localization/fr/OrchardCore.Themes.po b/Localization/fr/OrchardCore.Themes.po
index 8a936748077e8..0f4f73bf81ec6 100644
--- a/Localization/fr/OrchardCore.Themes.po
+++ b/Localization/fr/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exporte les thèmes sélectionnés site et admin."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr "Changer le thème"
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr "Auto"
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr "Clair"
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr "Sombre"
+
diff --git a/Localization/fr/OrchardCore.Title.po b/Localization/fr/OrchardCore.Title.po
index 272ea8fae1202..08a10d5df1722 100644
--- a/Localization/fr/OrchardCore.Title.po
+++ b/Localization/fr/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Une valeur est requise pour le titre."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr "Une valeur est requise pour le titre."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Le modèle ne contient pas une expression Liquid valide. Détails: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Le titre sera généré automatiquement en utilisant le modèle."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Cocher cette case pour afficher le titre dans les vues d'affichage."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/fr/OrchardCore.Twitter.po b/Localization/fr/OrchardCore.Twitter.po
index 368219ba85bb2..1a8b2bf866cc6 100644
--- a/Localization/fr/OrchardCore.Twitter.po
+++ b/Localization/fr/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "L'Access token secret est requis"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Tâche mettre à jour le statut Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Social"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Echec"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr "Twitter"
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Le locataire actuel sera rechargé lorsque les paramètres seront sauvegardés."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Voir la documentation"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "Une erreur s'est produite lors du déchiffrement d'un paramètre. Veuillez appliquer et sauvegarder."
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Paramètres d'intégration Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Clé API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "La clé API définie dans l'onglet Clés et jetons du tableau de bord de l'application twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Clé secrète API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "La clé secrète d'API définie dans l'onglet Clés et jetons du tableau de bord de l'application twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Jeton d'accès"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Le jeton d'accès défini dans l'onglet Clés et jetons du tableau de bord de l'application twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Secret du jeton d'accès"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Le Secret du jeton d'accès dans l'onglet Clés et jetons du tableau de bord de l'application twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Se connecter avec les paramètres Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Mettre à jour le statut Twitter"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/fr/OrchardCore.Users.Core.po b/Localization/fr/OrchardCore.Users.Core.po
index 48b8db8cddf56..5d47eff29a661 100644
--- a/Localization/fr/OrchardCore.Users.Core.po
+++ b/Localization/fr/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "L'e-mail '{0}' est invalide."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr "Le jeton de réinitialisation n'est pas valide. Veuillez demander un nouveau jeton."
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Erreur inattendue : '{0}'."
diff --git a/Localization/fr/OrchardCore.Users.po b/Localization/fr/OrchardCore.Users.po
index 2b1f1cf15f4a5..affce6803535d 100644
--- a/Localization/fr/OrchardCore.Users.po
+++ b/Localization/fr/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Utilisateur créé avec succès"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "La connexion locale est désactivée."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Le compte est verrouillé."
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Tentative de connexion non valide."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe a été modifié avec succès."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Une erreur est survenue dans le fournisseur externe."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Le site ne permet pas l'inscription d’utilisateur."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Confirmer votre compte"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "L'utilisateur spécifié n'est pas autorisé à se connecter."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Vous devez confirmer votre adresse email."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Tous les utilisateurs"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Utilisateurs activés"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Utilisateurs désactivés"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nom"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Approuver"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Activer"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Désactiver"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Supprimer"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr "Tous les rôles"
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Authentifiés (sans rôles)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Utilisateur {0} approuvé avec succès."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Utilisateur {0} supprimé avec succès."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Utilisateur {0} désactivé avec succès."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Utilisateur {0} activé avec succès."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Utilisateur créé avec succès."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Utilisateur mis à jour avec succès."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Utilisateur supprimé avec succès."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Impossible de supprimer l'utilisateur."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Mot de passe correctement mis à jour."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Utilisateur déverrouillé avec succès."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Impossible de déverrouiller l'utilisateur."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr "Impossible de trouver un fournisseur actif à deux facteurs."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr "Le compte est verrouillé."
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr "Code de vérification non valide."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr "Le compte est verrouillé"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr "Veuillez fournir un numéro de téléphone valide."
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "Impossible de mettre à jour vos propres rôles."
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Paramètres de connexion"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exporte les paramètres de connexion."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Paramètres de changement d'email"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exporte les paramètres de changement d'email."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Paramètres d'inscription"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exporte les paramètres d'inscription."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Paramètres de réinitialisation du mot de passe"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exporte les paramètres de réinitialisation du mot de passe."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Le nouveau mot de passe et le mot de passe de confirmation ne correspondent pas."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Tâche assigner les rôles aux utilisateurs"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Utilisateur"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Echec"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Tâche inscrire un utilisateur"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Utilisateur"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Valide"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Invalide"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Aucun service de courriel n'est disponible"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Événement Mise à jour d'utilisateur"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Utilisateur"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Tâche Valider l'utilisateur"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonyme"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Authentifié"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "InRole"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Une valeur est requise pour {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr "Tous les utilisateurs"
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr "Tous les utilisateurs"
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr "Ajoute tous les utilisateurs au plan."
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr "Tous les utilisateurs"
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr "Exporte tous les utilisateurs."
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} au rôle {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "L'utilisateur à assigner. Supporte la syntaxe Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Créer un utilisateur"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr "Paramètres personnalisés de l'utilisateur"
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr "Inclure tous les paramètres utilisateur personnalisés."
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr "Les paramètres utilisateur personnalisés à ajouter dans le plan."
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr "Paramètres personnalisés de l'utilisateur"
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr "Tous"
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr "Aucun paramètre personnalisé sélectionné."
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr "Paramètres personnalisés de l'utilisateur"
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr "Exporte tous les paramètres utilisateur personnalisés ou spécifiés."
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Modifier le mot de passe"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr "Paramètres Email Authenticator"
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr "Le sujet de l'email pour l'envoi du code de vérification. La syntaxe Liquid est prise en charge."
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Veuillez vérifier votre email pour réinitialiser votre mot de passe."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr "Veuillez saisir le code"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Changer l'email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr "Pour utiliser le SMS comme méthode d'authentification à deux facteurs, veuillez cliquer sur le bouton 'Demander le code' ci-dessous afin de confirmer votre numéro de téléphone."
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr "Oublier cet appareil"
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Vous vous êtes authentifié avec succès avec <strong>{0}</strong>. Vous avez déjà un compte avec cette adresse email. Entrez le mot de passe de votre compte local et cliquez sur le bouton S'inscrire pour lier les comptes et terminer la connexion."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Connexion"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Utiliser un autre service pour se connecter"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Connectez-vous à l'aide de votre compte {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr "Votre login est protégé par une seconde méthode d'authentification."
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Créer un nouveau compte."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Mot de passe"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Vous vous êtes authentifié avec succès avec <strong>{0}</strong>. Veuillez remplir le formulaire ci-dessous et cliquer sur le bouton S'inscrire pour terminer l'inscription."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Mot de passe"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Envoyer un email de confirmation"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "L'objet du message. Prise en charge de la syntaxe Liquid."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Accueil"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr "Veuillez saisir le code"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Réinitialiser votre mot de passe"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "L'utilisateur est désactivé."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "L'utilisateur est activé."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Décocher pour désactiver ce compte utilisateur."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr "Sécurité"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr "Nom d’utilisateur"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr "Veuillez saisir le code"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Définit la propriété de workflow 'UserName' si l'utilisateur est authentifié"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Rôles"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Le résultat 'InRole' sera renvoyé si l'utilisateur a au moins un des rôles sélectionnés."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr "Le résultat 'InRole' sera déclenché si l'utilisateur a au moins un des rôles sélectionnés."
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/fr/OrchardCore.Widgets.po b/Localization/fr/OrchardCore.Widgets.po
index 1668b3a03e535..99231d37abd8c 100644
--- a/Localization/fr/OrchardCore.Widgets.po
+++ b/Localization/fr/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Ajouter un Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Standard"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/fr/OrchardCore.Workflows.po b/Localization/fr/OrchardCore.Workflows.po
index 5fd6aaf204597..ebde16fb4028a 100644
--- a/Localization/fr/OrchardCore.Workflows.po
+++ b/Localization/fr/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Valider la tâche de transaction"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Session"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Valide"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Invalide"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Tâche Corréler"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Tâche For Each"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Itérer"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Tâche For"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Tâche For Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Itérer"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Tâche If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "True"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "False"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Tâche Join"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Joint"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Tâche Log"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Terminé"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Exceptions"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Tâche Notification"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "UI"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Tâche Script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Tâche Set Output"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Tâche Set Property"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Tâche While Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Itérer"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Terminé"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Activité mise à jour avec succès."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Récemment créés"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Moins récemment créés"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "En échec"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Terminé"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Le workflow {0} a été supprimé."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr "Une autre instance est déjà en cours d'exécution."
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr "Le workflow {0} a été redémarré."
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Le workflow {0} a été supprimé."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Le workflow a été enregistré."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Workflow {0} supprimé"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr "Événement Catch Workflow Fault"
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr "Background"
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr "Terminé"
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Tâche de redirection Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Terminé"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Événement de requête Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Terminé"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Matched"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Tâche de requête Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Statut Http non géré"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Tâche de réponse Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Terminé"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Non autorisé à déclencher '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Tâche de démarrage"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Modifier"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Ajouter"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Corréler"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Retour"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr "Redémarrer"
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr "Êtes-vous sûr de vouloir redémarrer cette instance de workflow ?"
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette instance de workflow ?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Supprimer"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "Avancé"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Valeur d'expiration de verrouillage invalide dans l'onglet avancé"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "Le temps d'attente en millisecondes pour acquérir un verrouillage avant de reprendre une instance de workflow donnée de ce type atomiquement. Laisser à zéro pour ne pas utiliser de verrouillage."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Événements disponibles"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Tâches disponibles"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette activité ?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtrer"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr "Tous"
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Avancé"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Valeur d'expiration de verrouillage invalide dans l'onglet avancé"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "Le temps d'attente en millisecondes pour acquérir un verrouillage avant de reprendre une instance de workflow donnée de ce type atomiquement. Laisser à zéro pour ne pas utiliser de verrouillage."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Itérer <em>{0}</em> sur <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "La liste à itérer. Supporte la syntaxe JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Pas de forks"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Itère <em>{0}</em> de <em>{1}</em> à <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "La valeur de début. Supporte la syntaxe JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "La valeur de fin. Supporte la syntaxe JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "La valeur de Step de la boucle. Supporte la syntaxe JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Redirection HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "L'URL vers laquelle rediriger. Avec support de Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Permanent"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Cocher si la redirection doit être permanente (301). Laisser décoché pour une redirection temporaire (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Gérer la requête HTTP entrante"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Quiconque invoque cette URL déclenchera ce workflow. Gardez-la dans un endroit sûr."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Valider le jeton d'Antiforgerie"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Décochez cette option si la requête provient d'un service qui invoque cette URL en tant que webhook. Si cette URL est demandée à partir d'un formulaire, alors gardez cette option cochée pour s'assurer que les valeurs du formulaire n'ont pas été altérées."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Délai de vie du jeton"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Cliquer sur le bouton <b>Regénérer</b> après avoir changé cette valeur."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Nombre de jours d'expiration du jeton. 0 pour que le jeton n'expire jamais"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr "Emplacement du formulaire"
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr "Cette clé sert à différencier l'emplacement du formulaire actuel. Laisser vide si le workflow gère un seul événement de formulaire."
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Filtrer la requête HTTP entrante"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "La méthode HTTP à laquelle correspondre."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Le nom du contrôleur auquel correspondre."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Le nom de l'action à laquelle correspondre."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr "<em>{0} {1}</em>"
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "L'URL à envoyer la requête. Supporte la syntaxe Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "La méthode HTTP. Par exemple : GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Le type de contenu du corps de la requête."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Le corps à envoyer avec les requêtes POST, PUT et PATCH. Supporte la syntaxe Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Fournir des en-têtes HTTP supplémentaires, un par ligne. Par exemple : Autorisation : Bearer 123ABC. Supporte la syntaxe Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "Réponse HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Le code de statut HTTP à renvoyer. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Cliquez ici</a> pour une liste complète."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Le type de contenu du corps de réponse."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Le corps à renvoyer. Supporte la syntaxe Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Évalue <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Trier"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr "Redémarrer"
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr "Êtes-vous sûr de vouloir redémarrer cette instance de workflow ?"
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette instance de workflow ?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Créé {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Rien ici !</strong> Il n'y a aucun workflow interrompu pour le moment."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Retour"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "sélectionné(s)"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Désactivé"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 instance"
-msgstr[1] "{0} instances"
+msgid "Instances"
+msgstr "Instances"
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Attendre <strong>n'importe quelle</strong> activité entrante avant de rejoindre l'exécution en un seul chemin."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Journal"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Le niveau de journalisation."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "Notification {0}"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Sélectionner le type de notification."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Script"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Une liste séparée par des virgules des résultats disponibles."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Sortie via {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Le nom à afficher."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Définir la propriété {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "La propriété à définir. Si la propriété spécifiée n'existe pas encore, elle sera ajoutée."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Quand <em>{0}</em> est déclenché"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr "<em>{0}</em>"
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Aucune action utilisateur spécifiée"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Entrez un ou plusieurs noms d'action séparés par des virgules."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Boucle tant que <em>{0}</em> est vrai"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Itère tant qu'une condition est vraie."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr "Événement Workflow Fault"
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr "Condition de déclenchement"
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr "Vérifiez les informations d'erreurs de workflow capturées et retournez une valeur booléenne. Si c'est vrai, elle sera traitée par le workflow actuel. Syntaxe Javascript."
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr "Vous pouvez utiliser input('{0}') pour obtenir les informations d'erreur, contient les attributs："
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr "{0}：Workflow Id."
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr "{0}：Workflow name."
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr "{0}：Nombre d'activités exécutées."
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr "{0}：Le nom de l'activité."
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr "{0}：Nom du type d'activité."
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr "{0}：Activity Id."
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr "{0}：Résumé des informations sur l'exception."
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr "{0}：Détails de l'exception."
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr "{0}：Contient des messages d'erreur soulevés manuellement par l'activité du workflow."
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr "Événement Workflow Fault"
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr "Déclencher et capturer les informations d'exception quand une exception se produit dans un autre workflow."
+
diff --git a/Localization/fr/TheAdmin.po b/Localization/fr/TheAdmin.po
index cb8fac8cb01d6..46f64fc41408d 100644
--- a/Localization/fr/TheAdmin.po
+++ b/Localization/fr/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Mode Clair"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Mode sombre"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Visiter le site"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Réduire / agrandir menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Êtes-vous certain de vouloir supprimer cet élément ?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Ok"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Annuler"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr "Listing des pages"
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr "Changer le thème"
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr "Auto"
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr "Clair"
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr "Sombre"
+
diff --git a/Localization/fr/TheAgencyTheme.po b/Localization/fr/TheAgencyTheme.po
index 73dedea49591d..7c0f94850b056 100644
--- a/Localization/fr/TheAgencyTheme.po
+++ b/Localization/fr/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr "Page introuvable"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr "La page demandée est introuvable."
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Il n'y a aucun résultat."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Page introuvable"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "La page demandée est introuvable."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/fr/TheBlogTheme.po b/Localization/fr/TheBlogTheme.po
index b684496009de8..dc0b7d490dce0 100644
--- a/Localization/fr/TheBlogTheme.po
+++ b/Localization/fr/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-02-18 20:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "le {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr "Page introuvable"
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Il n'y a aucun résultat."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Page introuvable"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/fr/TheTheme.po b/Localization/fr/TheTheme.po
index ebbbc9d128565..b56c2667bfdd1 100644
--- a/Localization/fr/TheTheme.po
+++ b/Localization/fr/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Bienvenue dans Orchard Core, votre site a été créé avec succès."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr "Changer le thème"
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr "Auto"
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr "Clair"
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr "Sombre"
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr "Vous avez plus de {0} notifications non lues"
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] "Vous avez {1} notification non lue"
+msgstr[1] "Vous avez {0} notification non lue"
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr "Vous n'avez aucune notification non lue"
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr "Centre de notifications"
+
diff --git a/Localization/he/OrchardCore.Admin.po b/Localization/he/OrchardCore.Admin.po
index f8f4bb62e1490..814e367153eaa 100644
--- a/Localization/he/OrchardCore.Admin.po
+++ b/Localization/he/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "הרגש חופשי לדפדף בתפריט בצד השמאלי ולגלות את כל האפשרויות."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/he/OrchardCore.AdminDashboard.po b/Localization/he/OrchardCore.AdminDashboard.po
index 97186981c608e..1a99693b17182 100644
--- a/Localization/he/OrchardCore.AdminDashboard.po
+++ b/Localization/he/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/he/OrchardCore.AdminMenu.po b/Localization/he/OrchardCore.AdminMenu.po
index 414e71ba4f344..4342557ca0d2d 100644
--- a/Localization/he/OrchardCore.AdminMenu.po
+++ b/Localization/he/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "יצירת תפריט הניהול {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "שם"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "צור צומת"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "יצירת תפריט הניהול {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "שם"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "ערוך צומת"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "קישור"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "טקסט הקישור כפי שהוא יוצג בעץ."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "כתובת ה-url של הקישור. קישור יוצג רק אם זה או אחד הילדים שלהם יש כתובת url. כתובת ה-url יהיה יחסית לשורש אתר הניהול"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "בחר סמל"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "מקום שמור"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "הטקסט של פריט התפריט כפי שהוא יוצג בעץ."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "בחר"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "בחר סמל כדי להציג כאשר פריט תפריט זה הוא ברמה הראשונה."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "בחר סמל"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Alias.po b/Localization/he/OrchardCore.Alias.po
index 8920bf77c5acc..b1017a26d839d 100644
--- a/Localization/he/OrchardCore.Alias.po
+++ b/Localization/he/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/he/OrchardCore.ArchiveLater.po b/Localization/he/OrchardCore.ArchiveLater.po
index d1252f75bedbd..c7346a58d570c 100644
--- a/Localization/he/OrchardCore.ArchiveLater.po
+++ b/Localization/he/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/he/OrchardCore.AuditTrail.po b/Localization/he/OrchardCore.AuditTrail.po
index f24bf34361620..44fdf1258098e 100644
--- a/Localization/he/OrchardCore.AuditTrail.po
+++ b/Localization/he/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/he/OrchardCore.Autoroute.po b/Localization/he/OrchardCore.Autoroute.po
index 31bd2cc610bdc..ef7ffb7d2833c 100644
--- a/Localization/he/OrchardCore.Autoroute.po
+++ b/Localization/he/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/he/OrchardCore.BackgroundTasks.po b/Localization/he/OrchardCore.BackgroundTasks.po
index e9253a1d86406..437e037b77d7a 100644
--- a/Localization/he/OrchardCore.BackgroundTasks.po
+++ b/Localization/he/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-22 07:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/he/OrchardCore.ContentFields.po b/Localization/he/OrchardCore.ContentFields.po
index 98acbeb77d7ce..4959bed22352b 100644
--- a/Localization/he/OrchardCore.ContentFields.po
+++ b/Localization/he/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "החלף"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "רגיל"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "לא פורסם"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "הקלד לחיפוש"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "בחר"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "הסר"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "לא נמצאו תוצאות"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "צור תרגום"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "לא פורסם"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "הקלד לחיפוש"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "בחר"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "הסר"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "לא נמצאו תוצאות"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "טווח"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "ללא"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "ערוך נתונים"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "בטל"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "נדרש"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "רמז"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "רוחב"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "גובה"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/he/OrchardCore.ContentLocalization.po b/Localization/he/OrchardCore.ContentLocalization.po
index e486164af4bb7..102b15a38dc2d 100644
--- a/Localization/he/OrchardCore.ContentLocalization.po
+++ b/Localization/he/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/he/OrchardCore.ContentPreview.po b/Localization/he/OrchardCore.ContentPreview.po
index e8dde90ca0657..050bfbda5df1d 100644
--- a/Localization/he/OrchardCore.ContentPreview.po
+++ b/Localization/he/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "תצוגה מקדימה נותקה"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "שגיאה בתצוגה מקדימה"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/he/OrchardCore.ContentTypes.po b/Localization/he/OrchardCore.ContentTypes.po
index b354a673fa45d..5eca68e540284 100644
--- a/Localization/he/OrchardCore.ContentTypes.po
+++ b/Localization/he/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "חלקי תוכן"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "{0} הוסרה."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "סוג תוכן חדש"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "חלק תוכן חדש"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "צור"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "שדות"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "ערוך"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "הסר"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "הוסף שדה"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "חלקים"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "הוסף חלקים"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "שמור"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "מחק"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/he/OrchardCore.Contents.po b/Localization/he/OrchardCore.Contents.po
index 32ced2f0af7f0..c6c52815cffc1 100644
--- a/Localization/he/OrchardCore.Contents.po
+++ b/Localization/he/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "כל סוגי התוכן"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "תוכן"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "הסתיים"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "בחר סמל"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "כל סוגי התוכן"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "כל סוגי התוכן"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "כל סוגי התוכן"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "צור תוכן חדש"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "תוכן"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "חדש"
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/he/OrchardCore.CustomSettings.po b/Localization/he/OrchardCore.CustomSettings.po
index abcfb31d3cbac..16ef192a6ba65 100644
--- a/Localization/he/OrchardCore.CustomSettings.po
+++ b/Localization/he/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "הגדרות לקוח"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "הכל"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/he/OrchardCore.Data.YesSql.po b/Localization/he/OrchardCore.Data.YesSql.po
index 9b421528cabf0..923e53c024a8a 100644
--- a/Localization/he/OrchardCore.Data.YesSql.po
+++ b/Localization/he/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Demo.po b/Localization/he/OrchardCore.Demo.po
index ad1d1df6860c2..feb35f6924448 100644
--- a/Localization/he/OrchardCore.Demo.po
+++ b/Localization/he/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/he/OrchardCore.Deployment.Remote.po b/Localization/he/OrchardCore.Deployment.Remote.po
index cecd645a2dccc..16278697dc151 100644
--- a/Localization/he/OrchardCore.Deployment.Remote.po
+++ b/Localization/he/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "שם"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "כתובת"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "שם הלקוח"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/he/OrchardCore.Deployment.po b/Localization/he/OrchardCore.Deployment.po
index ea391e5ef1c63..c166970e74b86 100644
--- a/Localization/he/OrchardCore.Deployment.po
+++ b/Localization/he/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "שם הוא חובה."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/he/OrchardCore.Diagnostics.po b/Localization/he/OrchardCore.Diagnostics.po
index 62cc45c4446f0..1fa507e9147e7 100644
--- a/Localization/he/OrchardCore.Diagnostics.po
+++ b/Localization/he/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "שגיאה אירעה בעת הרצת הבקשה."
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "אין לך גישה למשאב זה."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "הדף לא נמצא."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "אינך מורשה לראות תוכן זה."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/he/OrchardCore.Email.Abstractions.po b/Localization/he/OrchardCore.Email.Abstractions.po
index f9f2e352914ac..74fa9e9d017d5 100644
--- a/Localization/he/OrchardCore.Email.Abstractions.po
+++ b/Localization/he/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "השדה {0} נחוץ."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Email.po b/Localization/he/OrchardCore.Email.po
index e5e1c962c041b..9f62bb5b02e7c 100644
--- a/Localization/he/OrchardCore.Email.po
+++ b/Localization/he/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "משימת דואל"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "הסתיים"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "נכשל"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "הגדרות"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "אל"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "עותק מוסתר"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "עותק"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "השב ל"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "נושא"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "גוף ההודעה"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/he/OrchardCore.Facebook.po b/Localization/he/OrchardCore.Facebook.po
index f13f7c671e373..dd5adb1921546 100644
--- a/Localization/he/OrchardCore.Facebook.po
+++ b/Localization/he/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "הגדרות הזדהות"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/he/OrchardCore.Features.po b/Localization/he/OrchardCore.Features.po
index 259780aa6bdfe..f527a9e9df6ae 100644
--- a/Localization/he/OrchardCore.Features.po
+++ b/Localization/he/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "תכונות"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "אנא בחרתכונה אחת או יותר."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "פעולות גורפות"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "נטרל"
@@ -136,8 +136,8 @@ msgstr "נטרל"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "אפשר"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "לא מוגדר בקטגוריה"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "כן"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "לא"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Flows.po b/Localization/he/OrchardCore.Flows.po
index c27bc206073d0..9ad353653d7d1 100644
--- a/Localization/he/OrchardCore.Flows.po
+++ b/Localization/he/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "הוסף פריט"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "הכנס יישומון"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "מחק"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "האם אתה בטוח שברצונך להסיר פריט זה?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/he/OrchardCore.Forms.po b/Localization/he/OrchardCore.Forms.po
index 6541851a9141b..2fadc74569b2d 100644
--- a/Localization/he/OrchardCore.Forms.po
+++ b/Localization/he/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "אימות"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "הסתיים"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "אימות"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "הסתיים"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "אימות"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "הסתיים"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "בתוקף"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "לא בתוקף"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "אימות"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "הסתיים"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "בתוקף"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "לא בתוקף"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "אימות"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "בתוקף"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "לא בתוקף"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/he/OrchardCore.GitHub.po b/Localization/he/OrchardCore.GitHub.po
index bdb9766f6e1a7..15ab094f39c87 100644
--- a/Localization/he/OrchardCore.GitHub.po
+++ b/Localization/he/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/he/OrchardCore.Google.po b/Localization/he/OrchardCore.Google.po
index c4e122bd9b545..923251ad68ab3 100644
--- a/Localization/he/OrchardCore.Google.po
+++ b/Localization/he/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "הגדרות אימות של גוגל"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/he/OrchardCore.Html.po b/Localization/he/OrchardCore.Html.po
index b28d6433d9d70..30abee0a8869e 100644
--- a/Localization/he/OrchardCore.Html.po
+++ b/Localization/he/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "רגיל"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/he/OrchardCore.Https.po b/Localization/he/OrchardCore.Https.po
index 97b55f861d78b..8d48cd8e22953 100644
--- a/Localization/he/OrchardCore.Https.po
+++ b/Localization/he/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/he/OrchardCore.Infrastructure.Abstractions.po b/Localization/he/OrchardCore.Infrastructure.Abstractions.po
index b568caebca2f7..61d54c1774ce4 100644
--- a/Localization/he/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/he/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/he/OrchardCore.Layers.po b/Localization/he/OrchardCore.Layers.po
index 07ca410ae9c36..041717552f004 100644
--- a/Localization/he/OrchardCore.Layers.po
+++ b/Localization/he/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "שם"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "תיאור"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "שם"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "איזורים"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "הוסף יישומון"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "שכבות"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "ערוך"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "מחק"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "הוסף"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/he/OrchardCore.Liquid.po b/Localization/he/OrchardCore.Liquid.po
index 4c0673dc5c079..47cea2a917f1e 100644
--- a/Localization/he/OrchardCore.Liquid.po
+++ b/Localization/he/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/he/OrchardCore.Lists.po b/Localization/he/OrchardCore.Lists.po
index 902fbc60cc788..5240192f5c72b 100644
--- a/Localization/he/OrchardCore.Lists.po
+++ b/Localization/he/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "אין הרשאה למחוק תוכן זה"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "שם המשתמש או הדוא\"ל או הסיסמה שסופקו שגואים."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "רשימה זו ריקה"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "רשימות"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/he/OrchardCore.Localization.po b/Localization/he/OrchardCore.Localization.po
index b0bdbb8b3ebea..a7a2e3410bfed 100644
--- a/Localization/he/OrchardCore.Localization.po
+++ b/Localization/he/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "תרבות"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "תרבות נדרשת"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "הוסף תרבות"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/he/OrchardCore.Markdown.po b/Localization/he/OrchardCore.Markdown.po
index ee345c7bb33ec..56f39f6a54ad5 100644
--- a/Localization/he/OrchardCore.Markdown.po
+++ b/Localization/he/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/he/OrchardCore.Media.po b/Localization/he/OrchardCore.Media.po
index f6764c8175a3f..4685d19036d6a 100644
--- a/Localization/he/OrchardCore.Media.po
+++ b/Localization/he/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/he/OrchardCore.Menu.po b/Localization/he/OrchardCore.Menu.po
index 22dd3b1906264..1cefdb382e56f 100644
--- a/Localization/he/OrchardCore.Menu.po
+++ b/Localization/he/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/he/OrchardCore.Microsoft.Authentication.po b/Localization/he/OrchardCore.Microsoft.Authentication.po
index d3ac5c7281562..95888c285fc14 100644
--- a/Localization/he/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/he/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/he/OrchardCore.Navigation.po b/Localization/he/OrchardCore.Navigation.po
index 76a867dbc372f..1e6b66e1f9952 100644
--- a/Localization/he/OrchardCore.Navigation.po
+++ b/Localization/he/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Notifications.po b/Localization/he/OrchardCore.Notifications.po
index fceee2fc14368..351ffd58871f8 100644
--- a/Localization/he/OrchardCore.Notifications.po
+++ b/Localization/he/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/he/OrchardCore.OpenId.po b/Localization/he/OrchardCore.OpenId.po
index 1789df8aa659c..864d29075113e 100644
--- a/Localization/he/OrchardCore.OpenId.po
+++ b/Localization/he/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/he/OrchardCore.Placements.po b/Localization/he/OrchardCore.Placements.po
index 0298ab36f3712..45eb2443a4ffd 100644
--- a/Localization/he/OrchardCore.Placements.po
+++ b/Localization/he/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/he/OrchardCore.ProjectTemplates.po b/Localization/he/OrchardCore.ProjectTemplates.po
index 389257346170f..d39efa1d35770 100644
--- a/Localization/he/OrchardCore.ProjectTemplates.po
+++ b/Localization/he/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-05-05 19:06\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/he/OrchardCore.PublishLater.po b/Localization/he/OrchardCore.PublishLater.po
index e4161563f87cd..9b45b50eab71b 100644
--- a/Localization/he/OrchardCore.PublishLater.po
+++ b/Localization/he/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/he/OrchardCore.Queries.po b/Localization/he/OrchardCore.Queries.po
index cd1142d888d84..ef4f86557403e 100644
--- a/Localization/he/OrchardCore.Queries.po
+++ b/Localization/he/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/he/OrchardCore.ReCaptcha.Core.po b/Localization/he/OrchardCore.ReCaptcha.Core.po
index f0fc2d92bf486..cd8ff6585a3e6 100644
--- a/Localization/he/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/he/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/he/OrchardCore.ReCaptcha.po b/Localization/he/OrchardCore.ReCaptcha.po
index e28ebceb1123b..496bedc8d8750 100644
--- a/Localization/he/OrchardCore.ReCaptcha.po
+++ b/Localization/he/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/he/OrchardCore.Recipes.Core.po b/Localization/he/OrchardCore.Recipes.Core.po
index 704edac778937..d4832ff48e076 100644
--- a/Localization/he/OrchardCore.Recipes.Core.po
+++ b/Localization/he/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/he/OrchardCore.Roles.po b/Localization/he/OrchardCore.Roles.po
index 37861d1729c78..fd3cc5702854d 100644
--- a/Localization/he/OrchardCore.Roles.po
+++ b/Localization/he/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/he/OrchardCore.Rules.po b/Localization/he/OrchardCore.Rules.po
index 7ca4640f62c10..853a75782ecfc 100644
--- a/Localization/he/OrchardCore.Rules.po
+++ b/Localization/he/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/he/OrchardCore.Search.Elasticsearch.po b/Localization/he/OrchardCore.Search.Elasticsearch.po
index edc620dacbdf9..4f5c804bf1401 100644
--- a/Localization/he/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/he/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/he/OrchardCore.Search.Lucene.po b/Localization/he/OrchardCore.Search.Lucene.po
index 8a5e1fa1ccfde..236e40133ee99 100644
--- a/Localization/he/OrchardCore.Search.Lucene.po
+++ b/Localization/he/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Search.po b/Localization/he/OrchardCore.Search.po
index c786437e17297..7edc90f8c75c2 100644
--- a/Localization/he/OrchardCore.Search.po
+++ b/Localization/he/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/he/OrchardCore.Security.po b/Localization/he/OrchardCore.Security.po
index c8b1b0d415dab..2e1c11eb4a68f 100644
--- a/Localization/he/OrchardCore.Security.po
+++ b/Localization/he/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/he/OrchardCore.Seo.po b/Localization/he/OrchardCore.Seo.po
index e3739d24b3722..d65d40ee430c2 100644
--- a/Localization/he/OrchardCore.Seo.po
+++ b/Localization/he/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/he/OrchardCore.Settings.po b/Localization/he/OrchardCore.Settings.po
index 41265d5aa6eaf..61087a5519135 100644
--- a/Localization/he/OrchardCore.Settings.po
+++ b/Localization/he/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/he/OrchardCore.Setup.Core.po b/Localization/he/OrchardCore.Setup.Core.po
index 402565098cd88..32a81d1b95eb8 100644
--- a/Localization/he/OrchardCore.Setup.Core.po
+++ b/Localization/he/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/he/OrchardCore.Setup.po b/Localization/he/OrchardCore.Setup.po
index 4a1cc0063c311..a0cc7c091f919 100644
--- a/Localization/he/OrchardCore.Setup.po
+++ b/Localization/he/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/he/OrchardCore.Shortcodes.po b/Localization/he/OrchardCore.Shortcodes.po
index 1bd623417a300..667b60b854c5a 100644
--- a/Localization/he/OrchardCore.Shortcodes.po
+++ b/Localization/he/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/he/OrchardCore.Sitemaps.po b/Localization/he/OrchardCore.Sitemaps.po
index 9aaf54513febc..d6c98b93d9aeb 100644
--- a/Localization/he/OrchardCore.Sitemaps.po
+++ b/Localization/he/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/he/OrchardCore.Sms.po b/Localization/he/OrchardCore.Sms.po
index 875e925a83240..4015866075cca 100644
--- a/Localization/he/OrchardCore.Sms.po
+++ b/Localization/he/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/he/OrchardCore.Spatial.po b/Localization/he/OrchardCore.Spatial.po
index a2c19309ffacb..d2b28369103d6 100644
--- a/Localization/he/OrchardCore.Spatial.po
+++ b/Localization/he/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/he/OrchardCore.Taxonomies.po b/Localization/he/OrchardCore.Taxonomies.po
index d46ba5a175857..6a283144a201d 100644
--- a/Localization/he/OrchardCore.Taxonomies.po
+++ b/Localization/he/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Templates.Cms.Module.po b/Localization/he/OrchardCore.Templates.Cms.Module.po
index db8e3300f6960..ac77ae0f54240 100644
--- a/Localization/he/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/he/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2022-05-05 19:17\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/he/OrchardCore.Templates.po b/Localization/he/OrchardCore.Templates.po
index 672e4d5ef4681..311fd4d91e146 100644
--- a/Localization/he/OrchardCore.Templates.po
+++ b/Localization/he/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/he/OrchardCore.Tenants.po b/Localization/he/OrchardCore.Tenants.po
index f860ba48d0853..f82f2e08e0f1a 100644
--- a/Localization/he/OrchardCore.Tenants.po
+++ b/Localization/he/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/he/OrchardCore.Tests.po b/Localization/he/OrchardCore.Tests.po
index 1b74ee596f016..713b8cbcb3abc 100644
--- a/Localization/he/OrchardCore.Tests.po
+++ b/Localization/he/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/he/OrchardCore.Themes.po b/Localization/he/OrchardCore.Themes.po
index 5e4e5cdefdc3b..6a06e673ffecb 100644
--- a/Localization/he/OrchardCore.Themes.po
+++ b/Localization/he/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/he/OrchardCore.Title.po b/Localization/he/OrchardCore.Title.po
index 9ca45e5106ef9..9e2444060a07c 100644
--- a/Localization/he/OrchardCore.Title.po
+++ b/Localization/he/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/he/OrchardCore.Twitter.po b/Localization/he/OrchardCore.Twitter.po
index ce70043e9efc7..4536502ad92b4 100644
--- a/Localization/he/OrchardCore.Twitter.po
+++ b/Localization/he/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/he/OrchardCore.Users.Core.po b/Localization/he/OrchardCore.Users.Core.po
index de718f6c769ce..b2a5d11b60f09 100644
--- a/Localization/he/OrchardCore.Users.Core.po
+++ b/Localization/he/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/he/OrchardCore.Users.po b/Localization/he/OrchardCore.Users.po
index e239a13d75201..e9a56efb20e41 100644
--- a/Localization/he/OrchardCore.Users.po
+++ b/Localization/he/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,16 +3518,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/he/OrchardCore.Widgets.po b/Localization/he/OrchardCore.Widgets.po
index f2d02a7c10a2e..d9f60d1637d91 100644
--- a/Localization/he/OrchardCore.Widgets.po
+++ b/Localization/he/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/he/OrchardCore.Workflows.po b/Localization/he/OrchardCore.Workflows.po
index c767270a213d5..daf238a48e58d 100644
--- a/Localization/he/OrchardCore.Workflows.po
+++ b/Localization/he/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/he/TheAdmin.po b/Localization/he/TheAdmin.po
index ad5c9995dcf46..fe5681ae67cfa 100644
--- a/Localization/he/TheAdmin.po
+++ b/Localization/he/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/he/TheAgencyTheme.po b/Localization/he/TheAgencyTheme.po
index 243ebf90edd59..dcff2327d2a22 100644
--- a/Localization/he/TheAgencyTheme.po
+++ b/Localization/he/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/he/TheBlogTheme.po b/Localization/he/TheBlogTheme.po
index d3d1f2c8ea734..d060d01006072 100644
--- a/Localization/he/TheBlogTheme.po
+++ b/Localization/he/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/he/TheTheme.po b/Localization/he/TheTheme.po
index dd083bd833c68..6c6d59c7a12ba 100644
--- a/Localization/he/TheTheme.po
+++ b/Localization/he/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/hr/OrchardCore.Admin.po b/Localization/hr/OrchardCore.Admin.po
index 1814217694e98..23f5da2ba3314 100644
--- a/Localization/hr/OrchardCore.Admin.po
+++ b/Localization/hr/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Admin postavke"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Izvoz Admin postavki."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Slobodno pregledajte izbornik i otkrijte njegove mogućnosti."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Omogući tamni način unutar administratorske teme"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Je li omogućeno prikazivanje Admin teme u tamnom načinu."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/hr/OrchardCore.AdminDashboard.po b/Localization/hr/OrchardCore.AdminDashboard.po
index 618c7cea30380..9c0a7780d6a79 100644
--- a/Localization/hr/OrchardCore.AdminDashboard.po
+++ b/Localization/hr/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/hr/OrchardCore.AdminMenu.po b/Localization/hr/OrchardCore.AdminMenu.po
index 7fe14774fe09b..d14b6d9f35c01 100644
--- a/Localization/hr/OrchardCore.AdminMenu.po
+++ b/Localization/hr/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Naziv"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -573,7 +573,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -585,7 +585,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -598,49 +598,49 @@ msgid "Pick"
 msgstr "Odaberite"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Odaberite ikonu"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Alias.po b/Localization/hr/OrchardCore.Alias.po
index 8f2227c8c2f44..8b01709d162d7 100644
--- a/Localization/hr/OrchardCore.Alias.po
+++ b/Localization/hr/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hr/OrchardCore.ArchiveLater.po b/Localization/hr/OrchardCore.ArchiveLater.po
index b785affd7754e..e46298cf422a0 100644
--- a/Localization/hr/OrchardCore.ArchiveLater.po
+++ b/Localization/hr/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-10-11 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/hr/OrchardCore.AuditTrail.po b/Localization/hr/OrchardCore.AuditTrail.po
index 431ac28749c9d..8e0cbb1390195 100644
--- a/Localization/hr/OrchardCore.AuditTrail.po
+++ b/Localization/hr/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -579,7 +579,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -633,7 +633,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -645,7 +645,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/hr/OrchardCore.Autoroute.po b/Localization/hr/OrchardCore.Autoroute.po
index 1db7f992cd907..4e5ceb0ca1574 100644
--- a/Localization/hr/OrchardCore.Autoroute.po
+++ b/Localization/hr/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hr/OrchardCore.BackgroundTasks.po b/Localization/hr/OrchardCore.BackgroundTasks.po
index e256aafda631b..b10430f427cef 100644
--- a/Localization/hr/OrchardCore.BackgroundTasks.po
+++ b/Localization/hr/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/hr/OrchardCore.ContentFields.po b/Localization/hr/OrchardCore.ContentFields.po
index aaaa9b34228aa..d1984be1a5dd2 100644
--- a/Localization/hr/OrchardCore.ContentFields.po
+++ b/Localization/hr/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Prekidač"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Nema sadržaja."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standardno"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nije objavljeno"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Upišite za pretraživanje"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Odaberi"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Ukloni"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nema pronađenih rezultata"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Dozvoliti više odabranih elemenata."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Prikazati sve vrste sadržaja"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Vrste sadržaja za prikazati. Izabrati barem jedan."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Lokalizirano"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Opcije editora, jezik je uvijek postavljen an html pri spremanju."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentacija za opcije"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Koristi li se url kad se izabere medij (zadano: koristi se shortcode)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentacija za opcije"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Tekst linka"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Je li url obvezan."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Koristi url linka"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Savjet (placeholder) za prikazati kad je unos url-a prazan."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Savjet (placeholder) za prikazati kad je unos teksta prazan."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Pravilan url za predložiti pri stvaranju sadržaja."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Nema sadržaja."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Standardno"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nije objavljeno"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Upišite za pretraživanje"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Odaberi"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Ukloni"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nema pronađenih rezultata"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Dozvoliti više odabranih elemenata."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Vrste sadržaja za prikazati. Izabrati barem jedan."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Checkbox lista"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Upišite za pretraživanje"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Odaberi"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Ukloni"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Nema pronađenih vrijednosti"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Uređivanje podataka"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON za dozvoljene vrijednosti, npr. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Raspon"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Nijedno"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Spiner"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Savjet za prikazati kad je polje prazno. (neobvezno)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Broj znamenki nakon decimalnog znaka."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Minimalna dopuštena vrijednost. (neobvezno)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Maksimalna dopuštena vrijednost. (neobvezno)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Unesi opcije editora."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentacija za opcije"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Uređivanje podataka"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON za dozvoljene vrijednosti, npr. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Odustani"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Nema korisnika."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Standardno"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Isključen"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Upišite za pretraživanje"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Odaberi"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Ukloni"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Nema pronađenih rezultata"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Dozvoliti više odabranih elemenata."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Dozvoliti selektoru da prikaže sve korisnike svih rola."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Obvezno"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Je li vrijednost obvezna."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Savjet"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Širina"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Širina 'Videoboxa'"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Visina"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Visina Videoboxa"
diff --git a/Localization/hr/OrchardCore.ContentLocalization.po b/Localization/hr/OrchardCore.ContentLocalization.po
index 092dac6a552f0..50d5cdbfbd33a 100644
--- a/Localization/hr/OrchardCore.ContentLocalization.po
+++ b/Localization/hr/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/hr/OrchardCore.ContentPreview.po b/Localization/hr/OrchardCore.ContentPreview.po
index b9b3ec2e54042..39088f57bec1b 100644
--- a/Localization/hr/OrchardCore.ContentPreview.po
+++ b/Localization/hr/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hr/OrchardCore.ContentTypes.po b/Localization/hr/OrchardCore.ContentTypes.po
index e5b5c76b04520..be56e5b7d5217 100644
--- a/Localization/hr/OrchardCore.ContentTypes.po
+++ b/Localization/hr/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Contents.po b/Localization/hr/OrchardCore.Contents.po
index be5b8882e961d..3e8e2f01af158 100644
--- a/Localization/hr/OrchardCore.Contents.po
+++ b/Localization/hr/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1737,7 +1737,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1779,13 +1779,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1835,9 +1835,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1851,9 +1851,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2029,7 +2029,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2065,7 +2065,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2101,7 +2101,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2137,7 +2137,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2173,7 +2173,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2197,7 +2197,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2239,7 +2239,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2287,37 +2287,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2347,7 +2347,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2437,7 +2437,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2513,8 +2513,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2537,7 +2537,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2579,7 +2579,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2621,7 +2621,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2663,7 +2663,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2675,7 +2675,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/hr/OrchardCore.CustomSettings.po b/Localization/hr/OrchardCore.CustomSettings.po
index c887bfdee8027..d2e5581548333 100644
--- a/Localization/hr/OrchardCore.CustomSettings.po
+++ b/Localization/hr/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/hr/OrchardCore.Data.YesSql.po b/Localization/hr/OrchardCore.Data.YesSql.po
index 506182abe6e8f..246e3bfcf989f 100644
--- a/Localization/hr/OrchardCore.Data.YesSql.po
+++ b/Localization/hr/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Demo.po b/Localization/hr/OrchardCore.Demo.po
index d8eaa76a9e13f..f5631958bb876 100644
--- a/Localization/hr/OrchardCore.Demo.po
+++ b/Localization/hr/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/hr/OrchardCore.Deployment.Remote.po b/Localization/hr/OrchardCore.Deployment.Remote.po
index 1648ccaca3ce7..70c256a4e9fb7 100644
--- a/Localization/hr/OrchardCore.Deployment.Remote.po
+++ b/Localization/hr/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/hr/OrchardCore.Deployment.po b/Localization/hr/OrchardCore.Deployment.po
index 90cdbfd85e693..c22f316378bd4 100644
--- a/Localization/hr/OrchardCore.Deployment.po
+++ b/Localization/hr/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -576,7 +576,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -618,7 +618,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -630,7 +630,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -642,7 +642,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -654,7 +654,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -666,7 +666,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -678,7 +678,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -690,7 +690,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -702,7 +702,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/hr/OrchardCore.Diagnostics.po b/Localization/hr/OrchardCore.Diagnostics.po
index ac2dfe6d3c769..0726439110ccd 100644
--- a/Localization/hr/OrchardCore.Diagnostics.po
+++ b/Localization/hr/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2021-07-15 18:36\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/hr/OrchardCore.Email.Abstractions.po b/Localization/hr/OrchardCore.Email.Abstractions.po
index 5d070fc518bdf..1a40998a7da60 100644
--- a/Localization/hr/OrchardCore.Email.Abstractions.po
+++ b/Localization/hr/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-03-05 10:55\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Email.po b/Localization/hr/OrchardCore.Email.po
index b45923bf23e0f..2265c6b3bcb96 100644
--- a/Localization/hr/OrchardCore.Email.po
+++ b/Localization/hr/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/hr/OrchardCore.Facebook.po b/Localization/hr/OrchardCore.Facebook.po
index f960989389b3f..7d74a98e3b230 100644
--- a/Localization/hr/OrchardCore.Facebook.po
+++ b/Localization/hr/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/hr/OrchardCore.Features.po b/Localization/hr/OrchardCore.Features.po
index a3b1cadd8d6d6..068b54e84f322 100644
--- a/Localization/hr/OrchardCore.Features.po
+++ b/Localization/hr/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Flows.po b/Localization/hr/OrchardCore.Flows.po
index 4987977c04411..394b701d77a92 100644
--- a/Localization/hr/OrchardCore.Flows.po
+++ b/Localization/hr/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/hr/OrchardCore.Forms.po b/Localization/hr/OrchardCore.Forms.po
index b8ef59a790289..8c7c5c566156a 100644
--- a/Localization/hr/OrchardCore.Forms.po
+++ b/Localization/hr/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/hr/OrchardCore.GitHub.po b/Localization/hr/OrchardCore.GitHub.po
index 7fb7092ff5590..c104031c77212 100644
--- a/Localization/hr/OrchardCore.GitHub.po
+++ b/Localization/hr/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/hr/OrchardCore.Google.po b/Localization/hr/OrchardCore.Google.po
index 78509ca762653..4073d27812ab0 100644
--- a/Localization/hr/OrchardCore.Google.po
+++ b/Localization/hr/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/hr/OrchardCore.Html.po b/Localization/hr/OrchardCore.Html.po
index 09f377812c7db..1b0e23889f8a4 100644
--- a/Localization/hr/OrchardCore.Html.po
+++ b/Localization/hr/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Https.po b/Localization/hr/OrchardCore.Https.po
index 8ae5804caae6c..df5e48d350fbf 100644
--- a/Localization/hr/OrchardCore.Https.po
+++ b/Localization/hr/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-17 16:46\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/hr/OrchardCore.Infrastructure.Abstractions.po b/Localization/hr/OrchardCore.Infrastructure.Abstractions.po
index 4d5b6d27a40f1..e6be4beaf6a28 100644
--- a/Localization/hr/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/hr/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-03-05 10:55\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/hr/OrchardCore.Layers.po b/Localization/hr/OrchardCore.Layers.po
index e9ce59ab4b477..afce842e067dd 100644
--- a/Localization/hr/OrchardCore.Layers.po
+++ b/Localization/hr/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/hr/OrchardCore.Liquid.po b/Localization/hr/OrchardCore.Liquid.po
index 8fa0dceec428c..26ff1d7ab8ffb 100644
--- a/Localization/hr/OrchardCore.Liquid.po
+++ b/Localization/hr/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/hr/OrchardCore.Lists.po b/Localization/hr/OrchardCore.Lists.po
index 46e78952473fc..59f18dc016082 100644
--- a/Localization/hr/OrchardCore.Lists.po
+++ b/Localization/hr/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/hr/OrchardCore.Localization.po b/Localization/hr/OrchardCore.Localization.po
index 83bdb3431d882..defa9db0fa801 100644
--- a/Localization/hr/OrchardCore.Localization.po
+++ b/Localization/hr/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/hr/OrchardCore.Markdown.po b/Localization/hr/OrchardCore.Markdown.po
index 421ffdf1322dc..8de625339d5cb 100644
--- a/Localization/hr/OrchardCore.Markdown.po
+++ b/Localization/hr/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/hr/OrchardCore.Media.po b/Localization/hr/OrchardCore.Media.po
index eb3542476c602..5df088c377547 100644
--- a/Localization/hr/OrchardCore.Media.po
+++ b/Localization/hr/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -772,7 +772,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1004,7 +1004,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1062,13 +1062,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1087,43 +1087,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1134,49 +1134,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1296,7 +1296,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/hr/OrchardCore.Menu.po b/Localization/hr/OrchardCore.Menu.po
index c6d21c67d6cc3..495eee56dcf05 100644
--- a/Localization/hr/OrchardCore.Menu.po
+++ b/Localization/hr/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/hr/OrchardCore.Microsoft.Authentication.po b/Localization/hr/OrchardCore.Microsoft.Authentication.po
index bd90cb0fc6be9..ce670ef81edf9 100644
--- a/Localization/hr/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/hr/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/hr/OrchardCore.Navigation.po b/Localization/hr/OrchardCore.Navigation.po
index f7f823452883c..bcb652bf7a330 100644
--- a/Localization/hr/OrchardCore.Navigation.po
+++ b/Localization/hr/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Notifications.po b/Localization/hr/OrchardCore.Notifications.po
index 227eee8290d6b..da1d8eef6592a 100644
--- a/Localization/hr/OrchardCore.Notifications.po
+++ b/Localization/hr/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -106,21 +106,21 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -146,15 +146,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -251,7 +251,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -260,13 +260,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -327,13 +327,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -345,7 +345,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -357,7 +357,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -381,10 +381,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -407,7 +407,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -419,7 +419,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -431,7 +431,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -455,37 +455,32 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/hr/OrchardCore.OpenId.po b/Localization/hr/OrchardCore.OpenId.po
index 1280ea2a00286..e519ef1365f4e 100644
--- a/Localization/hr/OrchardCore.OpenId.po
+++ b/Localization/hr/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/hr/OrchardCore.Placements.po b/Localization/hr/OrchardCore.Placements.po
index 8c74bb6b4917b..cd0e027446837 100644
--- a/Localization/hr/OrchardCore.Placements.po
+++ b/Localization/hr/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/hr/OrchardCore.ProjectTemplates.po b/Localization/hr/OrchardCore.ProjectTemplates.po
index 3759e5b44c489..b3bdb714f6e13 100644
--- a/Localization/hr/OrchardCore.ProjectTemplates.po
+++ b/Localization/hr/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/hr/OrchardCore.PublishLater.po b/Localization/hr/OrchardCore.PublishLater.po
index 018eca910ab13..9a2a916c8740c 100644
--- a/Localization/hr/OrchardCore.PublishLater.po
+++ b/Localization/hr/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/hr/OrchardCore.Queries.po b/Localization/hr/OrchardCore.Queries.po
index 9eb22790a8261..42954aea521ed 100644
--- a/Localization/hr/OrchardCore.Queries.po
+++ b/Localization/hr/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -326,7 +326,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -362,7 +362,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -466,7 +466,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -478,7 +478,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/hr/OrchardCore.ReCaptcha.Core.po b/Localization/hr/OrchardCore.ReCaptcha.Core.po
index 688c9d2bcc44b..00b766aa16b0f 100644
--- a/Localization/hr/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/hr/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2021-07-15 19:00\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/hr/OrchardCore.ReCaptcha.po b/Localization/hr/OrchardCore.ReCaptcha.po
index 1bc025195e933..c2b0ba10cb33e 100644
--- a/Localization/hr/OrchardCore.ReCaptcha.po
+++ b/Localization/hr/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/hr/OrchardCore.Recipes.Core.po b/Localization/hr/OrchardCore.Recipes.Core.po
index a67f2a8cf4046..5fac71879b350 100644
--- a/Localization/hr/OrchardCore.Recipes.Core.po
+++ b/Localization/hr/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/hr/OrchardCore.Roles.po b/Localization/hr/OrchardCore.Roles.po
index eda508002d657..cd31371ea50b3 100644
--- a/Localization/hr/OrchardCore.Roles.po
+++ b/Localization/hr/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/hr/OrchardCore.Rules.po b/Localization/hr/OrchardCore.Rules.po
index 3cae6dad925f4..418ff8f20a447 100644
--- a/Localization/hr/OrchardCore.Rules.po
+++ b/Localization/hr/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/hr/OrchardCore.Search.Elasticsearch.po b/Localization/hr/OrchardCore.Search.Elasticsearch.po
index 8685551a3a052..203cd1c91dc7e 100644
--- a/Localization/hr/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/hr/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -812,7 +848,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -854,7 +890,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -866,7 +902,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -884,7 +920,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/hr/OrchardCore.Search.Lucene.po b/Localization/hr/OrchardCore.Search.Lucene.po
index 2ec821a584773..3c30dc9fabae8 100644
--- a/Localization/hr/OrchardCore.Search.Lucene.po
+++ b/Localization/hr/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -522,13 +522,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -570,13 +570,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -618,13 +618,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -648,7 +648,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -672,7 +672,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -690,7 +690,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -714,7 +714,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -816,7 +816,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -834,7 +834,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -865,7 +865,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Search.po b/Localization/hr/OrchardCore.Search.po
index 9976d36432235..6e17cda1ce690 100644
--- a/Localization/hr/OrchardCore.Search.po
+++ b/Localization/hr/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/hr/OrchardCore.Security.po b/Localization/hr/OrchardCore.Security.po
index adbdb7b258427..5739b1db2432a 100644
--- a/Localization/hr/OrchardCore.Security.po
+++ b/Localization/hr/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/hr/OrchardCore.Seo.po b/Localization/hr/OrchardCore.Seo.po
index 6e82fcd6286a2..05be84a510772 100644
--- a/Localization/hr/OrchardCore.Seo.po
+++ b/Localization/hr/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/hr/OrchardCore.Settings.po b/Localization/hr/OrchardCore.Settings.po
index e4d2ccc553372..efb1737e27b4e 100644
--- a/Localization/hr/OrchardCore.Settings.po
+++ b/Localization/hr/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/hr/OrchardCore.Setup.Core.po b/Localization/hr/OrchardCore.Setup.Core.po
index 3339404f2163e..aa2e8d5f093d6 100644
--- a/Localization/hr/OrchardCore.Setup.Core.po
+++ b/Localization/hr/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/hr/OrchardCore.Setup.po b/Localization/hr/OrchardCore.Setup.po
index e968eedcf76d8..65fa60641eeac 100644
--- a/Localization/hr/OrchardCore.Setup.po
+++ b/Localization/hr/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/hr/OrchardCore.Shortcodes.po b/Localization/hr/OrchardCore.Shortcodes.po
index cbdabd854ceec..20cad1ca7ad86 100644
--- a/Localization/hr/OrchardCore.Shortcodes.po
+++ b/Localization/hr/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/hr/OrchardCore.Sitemaps.po b/Localization/hr/OrchardCore.Sitemaps.po
index 699d7ee80bd2f..fade7681d20c8 100644
--- a/Localization/hr/OrchardCore.Sitemaps.po
+++ b/Localization/hr/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1024,7 +1024,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1036,7 +1036,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/hr/OrchardCore.Sms.po b/Localization/hr/OrchardCore.Sms.po
index c64700d4575b6..4753776ec1bde 100644
--- a/Localization/hr/OrchardCore.Sms.po
+++ b/Localization/hr/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/hr/OrchardCore.Spatial.po b/Localization/hr/OrchardCore.Spatial.po
index 3fbc1f5dac19a..db2f93704727e 100644
--- a/Localization/hr/OrchardCore.Spatial.po
+++ b/Localization/hr/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/hr/OrchardCore.Taxonomies.po b/Localization/hr/OrchardCore.Taxonomies.po
index 80532b6574b77..c7f97010c1109 100644
--- a/Localization/hr/OrchardCore.Taxonomies.po
+++ b/Localization/hr/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Polje {0} je obvezno"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Filteri taksonomija"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Oznake"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomija nije pronađena. Molim provjeri postavke polja."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Greška stvaranja oznaka"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Upišite za pretraživanje"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Odaberi"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Ukloni"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Stisni enter za stvoriti oznaku"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Nijedna oznaka pronađena"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Oznake"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Standardno"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomija nije pronađena. Molim provjeri postavke polja."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Standardno"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Savjet za prikazati za ovo polje u editoru."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taksonomija"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Obvezno"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Je li potreban barem jedan odabrani element?"
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Jedinstven"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Može li se samo jedan element izabrati."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Samo listovi"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Mogu li se samo listovi izabrati."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Mogu li se nove oznake stvarati u liniji: Pri stvaranju oznaka u liniji samo 'display text' će se postaviti."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Termin tip sadržaja"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Dodaj {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Presložili ste taksonomiju."
diff --git a/Localization/hr/OrchardCore.Templates.Cms.Module.po b/Localization/hr/OrchardCore.Templates.Cms.Module.po
index f1ebe62d46d92..8db1f580da241 100644
--- a/Localization/hr/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/hr/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/hr/OrchardCore.Templates.po b/Localization/hr/OrchardCore.Templates.po
index 57ec54d7b0c95..eecfb0e7bfb00 100644
--- a/Localization/hr/OrchardCore.Templates.po
+++ b/Localization/hr/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/hr/OrchardCore.Tenants.po b/Localization/hr/OrchardCore.Tenants.po
index f0f0dec06083c..2c2d973539c11 100644
--- a/Localization/hr/OrchardCore.Tenants.po
+++ b/Localization/hr/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1230,8 +1224,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1248,7 +1242,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1260,49 +1254,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1320,7 +1314,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/hr/OrchardCore.Tests.po b/Localization/hr/OrchardCore.Tests.po
index e0dedb9a4a807..c8b1a178d6a15 100644
--- a/Localization/hr/OrchardCore.Tests.po
+++ b/Localization/hr/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Themes.po b/Localization/hr/OrchardCore.Themes.po
index 242694f8e16b1..7f02a8098f059 100644
--- a/Localization/hr/OrchardCore.Themes.po
+++ b/Localization/hr/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/hr/OrchardCore.Title.po b/Localization/hr/OrchardCore.Title.po
index 19de502d38103..d3fcdc0620f29 100644
--- a/Localization/hr/OrchardCore.Title.po
+++ b/Localization/hr/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hr/OrchardCore.Twitter.po b/Localization/hr/OrchardCore.Twitter.po
index db0bc0febd7fd..51c943ae3adff 100644
--- a/Localization/hr/OrchardCore.Twitter.po
+++ b/Localization/hr/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/hr/OrchardCore.Users.Core.po b/Localization/hr/OrchardCore.Users.Core.po
index 84b0116a3d126..a04a193191087 100644
--- a/Localization/hr/OrchardCore.Users.Core.po
+++ b/Localization/hr/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/hr/OrchardCore.Users.po b/Localization/hr/OrchardCore.Users.po
index 6fb869e1e5abe..c7295f3c856cf 100644
--- a/Localization/hr/OrchardCore.Users.po
+++ b/Localization/hr/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Korisnik uspješno stvoren"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Lokalna prijava je isključena."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Ovaj račun je zaključan"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Neuspješna prijava."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Vaša lozinka je uspješno promijenjena."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Greška u eksternom sustavu prijave."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Stranica ne dopušta registraciju korisnika."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Potvrdi svoj račun"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Korisniku nije dozvoljena prijava."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Molimo potvrdite svoj e-mail."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Svi korisnici"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Omogućeni korisnici"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Isključeni korisnici"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Naziv"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Odobri"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Uključi"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Isključi"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Obriši"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Sve uloge"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Prijavljeni (no roles)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Korisnik {0} je uspješno odobren."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Korisnik {0} je uspješno izbrisan."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Korisnik {0} uspješno isključen."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Korisnik {0} je uspješno uključen."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Korisnik uspješno stvoren."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Korisnik uspješno ažuriran."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Korisnik uspješno izbrisan."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Neuspješno brisanje korisnika."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Lozinka uspješno ažurirana."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Korisnik uspješno otključan."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Neuspješno otključavanje korisnika."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Postavke prijave"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Izvoz postavki prijave."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Promijeni email postavke"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Izvoz promjena email postavki."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Postavke registracije"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Izvoz postavki registracije."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Postavke resetiranja lozinke"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Izvezi postavke resetiranja lozinke."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Lozinka i ponovljena lozinka se ne podudaraju."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Assign User Role Task"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Korisnik"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Izvršeno"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Neuspješno"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Register User Task"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Korisnik"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Izvršeno"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Važeći"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Nevažeći"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "No email service is available"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "User Updated Event"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Korisnik"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Validate User Task"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonimno"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Prijavljen"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "U roli"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Polje {0} je obvezno."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} roli {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Dodijeli korisnika. Podržava liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Promjena lozinke"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nova lozinka"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Kreiraj korisnika"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Promijeni lozinku"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nova lozinka"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Provjerite svoj email radi ponovnog postavljanja lozinke."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Promjeni email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Uspješno ste se prijavili koristeći <strong>{0}</strong>. Već imate račun s istom email adresom. Upišite svoju lokalnu lozinku i kliknite Registriraj se gumb kako bi povezali račune i završili prijavu."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Korisničko ime"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Prijava"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Koristi drugi servis za registraciju"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Prijavi se koristeći {0} račun"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Napravi novi korisnički račun."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Korisničko ime"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Lozinka"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Uspješno ste se prijavili koristeći <strong>{0}</strong>. Molimo ispunite obrazac i kliknite Registriraj se kako bi dovršili registraciju."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Korisničko ime"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Lozinka"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Pošalji email za provjeru"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Naslov poruke. Podržava Liquid sintaksu."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Početna"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Resetiraj lozinku"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nova lozinka"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Korisnik isključen."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Korisnik je uključen."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Odkvači kako bi isključio ovog korisnika."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3354,7 +3426,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Odustani"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3420,7 +3492,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3444,17 +3516,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Postavi 'UserName' workflow property ako je korisnik prijavljen"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Role"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "'InRole' rezultat će biti okinut ako korisnik ima barem jednu od odabranih rola."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/hr/OrchardCore.Widgets.po b/Localization/hr/OrchardCore.Widgets.po
index b0246843b3300..2ef1ce2d9469c 100644
--- a/Localization/hr/OrchardCore.Widgets.po
+++ b/Localization/hr/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/hr/OrchardCore.Workflows.po b/Localization/hr/OrchardCore.Workflows.po
index dfc0a89f2a864..d4bfa1c76e02a 100644
--- a/Localization/hr/OrchardCore.Workflows.po
+++ b/Localization/hr/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1708,40 +1772,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1842,14 +1920,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1883,7 +1958,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1913,7 +1988,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1925,7 +2000,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1973,7 +2048,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1985,7 +2060,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2015,7 +2090,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2027,7 +2102,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2057,7 +2132,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2069,7 +2144,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2099,7 +2174,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2111,7 +2186,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2147,7 +2222,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2183,7 +2258,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2237,7 +2312,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2249,7 +2324,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2285,7 +2360,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2309,3 +2384,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/hr/TheAdmin.po b/Localization/hr/TheAdmin.po
index 2336e9bc745df..1b1cf95ba29bb 100644
--- a/Localization/hr/TheAdmin.po
+++ b/Localization/hr/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Tamni način"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Sažmi / proširi izbornik"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Brisanje"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Jeste li sigurni da želite ukloniti ovaj element?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "U redu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Odustani"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/hr/TheAgencyTheme.po b/Localization/hr/TheAgencyTheme.po
index d5d3e7431161b..25f73433a5efa 100644
--- a/Localization/hr/TheAgencyTheme.po
+++ b/Localization/hr/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/hr/TheBlogTheme.po b/Localization/hr/TheBlogTheme.po
index 8b21583cf1a01..6a55207e6598f 100644
--- a/Localization/hr/TheBlogTheme.po
+++ b/Localization/hr/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-02-18 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ", {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Nema rezultata."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Stranica nije pronađena"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/hr/TheTheme.po b/Localization/hr/TheTheme.po
index 386c6ba46d6f7..d22bb4c2279e1 100644
--- a/Localization/hr/TheTheme.po
+++ b/Localization/hr/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,54 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/hu/OrchardCore.Admin.po b/Localization/hu/OrchardCore.Admin.po
index 89942dfafd68d..440c89ba4c01e 100644
--- a/Localization/hu/OrchardCore.Admin.po
+++ b/Localization/hu/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Admin beállítások"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Járd be szabadon a menüt és fedezd fel minden lehetőségét."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/hu/OrchardCore.AdminDashboard.po b/Localization/hu/OrchardCore.AdminDashboard.po
index c2360008c4ea9..9183bc1e087c3 100644
--- a/Localization/hu/OrchardCore.AdminDashboard.po
+++ b/Localization/hu/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/hu/OrchardCore.AdminMenu.po b/Localization/hu/OrchardCore.AdminMenu.po
index ea1bd9365617c..cd1094090566b 100644
--- a/Localization/hu/OrchardCore.AdminMenu.po
+++ b/Localization/hu/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Alias.po b/Localization/hu/OrchardCore.Alias.po
index 524d7c3d8863c..4395f7b4ec787 100644
--- a/Localization/hu/OrchardCore.Alias.po
+++ b/Localization/hu/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hu/OrchardCore.ArchiveLater.po b/Localization/hu/OrchardCore.ArchiveLater.po
index 2ccff5f6b74ac..4d7b611fdacb3 100644
--- a/Localization/hu/OrchardCore.ArchiveLater.po
+++ b/Localization/hu/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/hu/OrchardCore.AuditTrail.po b/Localization/hu/OrchardCore.AuditTrail.po
index 59cf8a9e95b8d..3868bfaadb0f7 100644
--- a/Localization/hu/OrchardCore.AuditTrail.po
+++ b/Localization/hu/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/hu/OrchardCore.Autoroute.po b/Localization/hu/OrchardCore.Autoroute.po
index 7b9d11567de55..85c8bf79d07e5 100644
--- a/Localization/hu/OrchardCore.Autoroute.po
+++ b/Localization/hu/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hu/OrchardCore.BackgroundTasks.po b/Localization/hu/OrchardCore.BackgroundTasks.po
index 68cff4abdc6f8..6a213879653ee 100644
--- a/Localization/hu/OrchardCore.BackgroundTasks.po
+++ b/Localization/hu/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-22 07:33\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/hu/OrchardCore.ContentFields.po b/Localization/hu/OrchardCore.ContentFields.po
index 20fbb760eb493..d1a65b2e280da 100644
--- a/Localization/hu/OrchardCore.ContentFields.po
+++ b/Localization/hu/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/hu/OrchardCore.ContentLocalization.po b/Localization/hu/OrchardCore.ContentLocalization.po
index 996cf14de43d2..9f1703f249ff6 100644
--- a/Localization/hu/OrchardCore.ContentLocalization.po
+++ b/Localization/hu/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/hu/OrchardCore.ContentPreview.po b/Localization/hu/OrchardCore.ContentPreview.po
index 24148058a2625..725cad9a5a1f2 100644
--- a/Localization/hu/OrchardCore.ContentPreview.po
+++ b/Localization/hu/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hu/OrchardCore.ContentTypes.po b/Localization/hu/OrchardCore.ContentTypes.po
index 3629420fd48d9..be4ac14333d99 100644
--- a/Localization/hu/OrchardCore.ContentTypes.po
+++ b/Localization/hu/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Contents.po b/Localization/hu/OrchardCore.Contents.po
index c28d1ffb41325..45bdada0e5add 100644
--- a/Localization/hu/OrchardCore.Contents.po
+++ b/Localization/hu/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/hu/OrchardCore.CustomSettings.po b/Localization/hu/OrchardCore.CustomSettings.po
index 4c7ab7d8116c8..6cc0fe7b281d8 100644
--- a/Localization/hu/OrchardCore.CustomSettings.po
+++ b/Localization/hu/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/hu/OrchardCore.Data.YesSql.po b/Localization/hu/OrchardCore.Data.YesSql.po
index ef80ab1679ac5..9f3f9a4bf580f 100644
--- a/Localization/hu/OrchardCore.Data.YesSql.po
+++ b/Localization/hu/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Demo.po b/Localization/hu/OrchardCore.Demo.po
index e5bb2f65aeaba..d1fc711b1eb48 100644
--- a/Localization/hu/OrchardCore.Demo.po
+++ b/Localization/hu/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/hu/OrchardCore.Deployment.Remote.po b/Localization/hu/OrchardCore.Deployment.Remote.po
index b9a5665441d2e..e9de889c4f735 100644
--- a/Localization/hu/OrchardCore.Deployment.Remote.po
+++ b/Localization/hu/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/hu/OrchardCore.Deployment.po b/Localization/hu/OrchardCore.Deployment.po
index 53cde7ccf54e0..11b382fbd9ba0 100644
--- a/Localization/hu/OrchardCore.Deployment.po
+++ b/Localization/hu/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/hu/OrchardCore.Diagnostics.po b/Localization/hu/OrchardCore.Diagnostics.po
index e89567acf0bbc..f3a2d20fb481f 100644
--- a/Localization/hu/OrchardCore.Diagnostics.po
+++ b/Localization/hu/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2021-07-15 18:34\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/hu/OrchardCore.Email.Abstractions.po b/Localization/hu/OrchardCore.Email.Abstractions.po
index b04ca50774ac0..2eceb36476072 100644
--- a/Localization/hu/OrchardCore.Email.Abstractions.po
+++ b/Localization/hu/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Email.po b/Localization/hu/OrchardCore.Email.po
index 169ba4640bda9..cb4f73297fae8 100644
--- a/Localization/hu/OrchardCore.Email.po
+++ b/Localization/hu/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/hu/OrchardCore.Facebook.po b/Localization/hu/OrchardCore.Facebook.po
index d772fcd59c4fc..f45964ae071ee 100644
--- a/Localization/hu/OrchardCore.Facebook.po
+++ b/Localization/hu/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/hu/OrchardCore.Features.po b/Localization/hu/OrchardCore.Features.po
index b5c5be440c6b0..39f723121dc69 100644
--- a/Localization/hu/OrchardCore.Features.po
+++ b/Localization/hu/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Flows.po b/Localization/hu/OrchardCore.Flows.po
index d41e5b4522be1..dbecd0b52436b 100644
--- a/Localization/hu/OrchardCore.Flows.po
+++ b/Localization/hu/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/hu/OrchardCore.Forms.po b/Localization/hu/OrchardCore.Forms.po
index 27163e8b8d8c5..c7e34f44a5035 100644
--- a/Localization/hu/OrchardCore.Forms.po
+++ b/Localization/hu/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/hu/OrchardCore.GitHub.po b/Localization/hu/OrchardCore.GitHub.po
index 5a95ef35511b8..b5d16acc1eff6 100644
--- a/Localization/hu/OrchardCore.GitHub.po
+++ b/Localization/hu/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/hu/OrchardCore.Google.po b/Localization/hu/OrchardCore.Google.po
index f16acaf2b24ae..26aa71c191536 100644
--- a/Localization/hu/OrchardCore.Google.po
+++ b/Localization/hu/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/hu/OrchardCore.Html.po b/Localization/hu/OrchardCore.Html.po
index eaa2517c3f14b..20704ef130a17 100644
--- a/Localization/hu/OrchardCore.Html.po
+++ b/Localization/hu/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Https.po b/Localization/hu/OrchardCore.Https.po
index 56153b80a672a..54a3b9641ddef 100644
--- a/Localization/hu/OrchardCore.Https.po
+++ b/Localization/hu/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/hu/OrchardCore.Infrastructure.Abstractions.po b/Localization/hu/OrchardCore.Infrastructure.Abstractions.po
index 9afa4822d189d..2b1bce14017b8 100644
--- a/Localization/hu/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/hu/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-03-05 10:49\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/hu/OrchardCore.Layers.po b/Localization/hu/OrchardCore.Layers.po
index fc740b27c5036..e520e7561a428 100644
--- a/Localization/hu/OrchardCore.Layers.po
+++ b/Localization/hu/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/hu/OrchardCore.Liquid.po b/Localization/hu/OrchardCore.Liquid.po
index 856fb7da77d0c..5d8b271232962 100644
--- a/Localization/hu/OrchardCore.Liquid.po
+++ b/Localization/hu/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/hu/OrchardCore.Lists.po b/Localization/hu/OrchardCore.Lists.po
index cc26a9c485328..ce02a1d145231 100644
--- a/Localization/hu/OrchardCore.Lists.po
+++ b/Localization/hu/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/hu/OrchardCore.Localization.po b/Localization/hu/OrchardCore.Localization.po
index aab96aaf4a229..f42cc8909f5eb 100644
--- a/Localization/hu/OrchardCore.Localization.po
+++ b/Localization/hu/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/hu/OrchardCore.Markdown.po b/Localization/hu/OrchardCore.Markdown.po
index b464003463336..9cab64c3167b2 100644
--- a/Localization/hu/OrchardCore.Markdown.po
+++ b/Localization/hu/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/hu/OrchardCore.Media.po b/Localization/hu/OrchardCore.Media.po
index 3401fb27ad178..013ab5f520ab7 100644
--- a/Localization/hu/OrchardCore.Media.po
+++ b/Localization/hu/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/hu/OrchardCore.Menu.po b/Localization/hu/OrchardCore.Menu.po
index c21a49d6b3115..a64948157453e 100644
--- a/Localization/hu/OrchardCore.Menu.po
+++ b/Localization/hu/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/hu/OrchardCore.Microsoft.Authentication.po b/Localization/hu/OrchardCore.Microsoft.Authentication.po
index 7fa704174ae08..401b6eb9a5cd2 100644
--- a/Localization/hu/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/hu/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/hu/OrchardCore.Navigation.po b/Localization/hu/OrchardCore.Navigation.po
index f9db2fd9b3a4f..12be458dcc11c 100644
--- a/Localization/hu/OrchardCore.Navigation.po
+++ b/Localization/hu/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Notifications.po b/Localization/hu/OrchardCore.Notifications.po
index 2e54c1fd914d8..8cf059355f189 100644
--- a/Localization/hu/OrchardCore.Notifications.po
+++ b/Localization/hu/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/hu/OrchardCore.OpenId.po b/Localization/hu/OrchardCore.OpenId.po
index ecda65d5b486b..979899869d761 100644
--- a/Localization/hu/OrchardCore.OpenId.po
+++ b/Localization/hu/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/hu/OrchardCore.Placements.po b/Localization/hu/OrchardCore.Placements.po
index 3e5433dd8f76a..dcd8aef2e0c9a 100644
--- a/Localization/hu/OrchardCore.Placements.po
+++ b/Localization/hu/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/hu/OrchardCore.ProjectTemplates.po b/Localization/hu/OrchardCore.ProjectTemplates.po
index b8172f5c67c6a..37ebc036bb2ff 100644
--- a/Localization/hu/OrchardCore.ProjectTemplates.po
+++ b/Localization/hu/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-05-05 19:06\n"
+"PO-Revision-Date: 2023-12-22 16:32\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/hu/OrchardCore.PublishLater.po b/Localization/hu/OrchardCore.PublishLater.po
index 9d8c74e4d9bb4..c0c6a08d846db 100644
--- a/Localization/hu/OrchardCore.PublishLater.po
+++ b/Localization/hu/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/hu/OrchardCore.Queries.po b/Localization/hu/OrchardCore.Queries.po
index 9817136425511..f654402844872 100644
--- a/Localization/hu/OrchardCore.Queries.po
+++ b/Localization/hu/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/hu/OrchardCore.ReCaptcha.Core.po b/Localization/hu/OrchardCore.ReCaptcha.Core.po
index 9ffc45b45e771..b5d5f8ad7d575 100644
--- a/Localization/hu/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/hu/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/hu/OrchardCore.ReCaptcha.po b/Localization/hu/OrchardCore.ReCaptcha.po
index c2b9c52549c01..13eb0f8d6186e 100644
--- a/Localization/hu/OrchardCore.ReCaptcha.po
+++ b/Localization/hu/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/hu/OrchardCore.Recipes.Core.po b/Localization/hu/OrchardCore.Recipes.Core.po
index 281bb8484000f..dad5f2197de3d 100644
--- a/Localization/hu/OrchardCore.Recipes.Core.po
+++ b/Localization/hu/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/hu/OrchardCore.Roles.po b/Localization/hu/OrchardCore.Roles.po
index 6a51fee9be02f..c16bea5aa08d5 100644
--- a/Localization/hu/OrchardCore.Roles.po
+++ b/Localization/hu/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/hu/OrchardCore.Rules.po b/Localization/hu/OrchardCore.Rules.po
index 3ed67aa0272ad..167d42b9b4cef 100644
--- a/Localization/hu/OrchardCore.Rules.po
+++ b/Localization/hu/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/hu/OrchardCore.Search.Elasticsearch.po b/Localization/hu/OrchardCore.Search.Elasticsearch.po
index e2962b7594484..8b21f0b4d4bc3 100644
--- a/Localization/hu/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/hu/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/hu/OrchardCore.Search.Lucene.po b/Localization/hu/OrchardCore.Search.Lucene.po
index cdef6a03f925b..adcb9db7c4a89 100644
--- a/Localization/hu/OrchardCore.Search.Lucene.po
+++ b/Localization/hu/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Search.po b/Localization/hu/OrchardCore.Search.po
index 2ab15eb3db15c..42e7a9473043b 100644
--- a/Localization/hu/OrchardCore.Search.po
+++ b/Localization/hu/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/hu/OrchardCore.Security.po b/Localization/hu/OrchardCore.Security.po
index 626f9cfd666f8..3e0d059281609 100644
--- a/Localization/hu/OrchardCore.Security.po
+++ b/Localization/hu/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/hu/OrchardCore.Seo.po b/Localization/hu/OrchardCore.Seo.po
index 2a59a682baac3..09b351880f15b 100644
--- a/Localization/hu/OrchardCore.Seo.po
+++ b/Localization/hu/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/hu/OrchardCore.Settings.po b/Localization/hu/OrchardCore.Settings.po
index 843de942e8a29..b6c9b327bee94 100644
--- a/Localization/hu/OrchardCore.Settings.po
+++ b/Localization/hu/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/hu/OrchardCore.Setup.Core.po b/Localization/hu/OrchardCore.Setup.Core.po
index 6d5ab2c3fc22f..b6927d335015e 100644
--- a/Localization/hu/OrchardCore.Setup.Core.po
+++ b/Localization/hu/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/hu/OrchardCore.Setup.po b/Localization/hu/OrchardCore.Setup.po
index feee1e23a04e0..fd45939ff22f9 100644
--- a/Localization/hu/OrchardCore.Setup.po
+++ b/Localization/hu/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/hu/OrchardCore.Shortcodes.po b/Localization/hu/OrchardCore.Shortcodes.po
index 4b9c1c96139b3..6ec56cd52ee6e 100644
--- a/Localization/hu/OrchardCore.Shortcodes.po
+++ b/Localization/hu/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/hu/OrchardCore.Sitemaps.po b/Localization/hu/OrchardCore.Sitemaps.po
index ed27e436203bc..c20c5d2281a36 100644
--- a/Localization/hu/OrchardCore.Sitemaps.po
+++ b/Localization/hu/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/hu/OrchardCore.Sms.po b/Localization/hu/OrchardCore.Sms.po
index 9e57f1bb1a9b9..24eb6d9536597 100644
--- a/Localization/hu/OrchardCore.Sms.po
+++ b/Localization/hu/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/hu/OrchardCore.Spatial.po b/Localization/hu/OrchardCore.Spatial.po
index 3ababd055eddd..e7edd94dac35f 100644
--- a/Localization/hu/OrchardCore.Spatial.po
+++ b/Localization/hu/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/hu/OrchardCore.Taxonomies.po b/Localization/hu/OrchardCore.Taxonomies.po
index 652086ab11d21..ff1ce3f1ab69b 100644
--- a/Localization/hu/OrchardCore.Taxonomies.po
+++ b/Localization/hu/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Templates.Cms.Module.po b/Localization/hu/OrchardCore.Templates.Cms.Module.po
index f985f3d7b93d6..b05c8c30957b7 100644
--- a/Localization/hu/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/hu/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2022-05-05 19:17\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/hu/OrchardCore.Templates.po b/Localization/hu/OrchardCore.Templates.po
index 3db958633f095..39b8f290fcede 100644
--- a/Localization/hu/OrchardCore.Templates.po
+++ b/Localization/hu/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/hu/OrchardCore.Tenants.po b/Localization/hu/OrchardCore.Tenants.po
index bf7433b988751..e65d210cc3d93 100644
--- a/Localization/hu/OrchardCore.Tenants.po
+++ b/Localization/hu/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/hu/OrchardCore.Tests.po b/Localization/hu/OrchardCore.Tests.po
index 1e046fcf8194d..07be74eae8a4c 100644
--- a/Localization/hu/OrchardCore.Tests.po
+++ b/Localization/hu/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Themes.po b/Localization/hu/OrchardCore.Themes.po
index 4cf347ec8bf1d..815d8d4c954a3 100644
--- a/Localization/hu/OrchardCore.Themes.po
+++ b/Localization/hu/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/hu/OrchardCore.Title.po b/Localization/hu/OrchardCore.Title.po
index 46c1189ed58f8..e73ae7176f7ad 100644
--- a/Localization/hu/OrchardCore.Title.po
+++ b/Localization/hu/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/hu/OrchardCore.Twitter.po b/Localization/hu/OrchardCore.Twitter.po
index b1f70435584a4..8b418c546e76b 100644
--- a/Localization/hu/OrchardCore.Twitter.po
+++ b/Localization/hu/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/hu/OrchardCore.Users.Core.po b/Localization/hu/OrchardCore.Users.Core.po
index 89e5b3fbcfb07..e13bb3074f96d 100644
--- a/Localization/hu/OrchardCore.Users.Core.po
+++ b/Localization/hu/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/hu/OrchardCore.Users.po b/Localization/hu/OrchardCore.Users.po
index 83ac9e729650c..6e7c7c06c8fe4 100644
--- a/Localization/hu/OrchardCore.Users.po
+++ b/Localization/hu/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/hu/OrchardCore.Widgets.po b/Localization/hu/OrchardCore.Widgets.po
index 591e03e4f6f04..3ca5aceda0df8 100644
--- a/Localization/hu/OrchardCore.Widgets.po
+++ b/Localization/hu/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/hu/OrchardCore.Workflows.po b/Localization/hu/OrchardCore.Workflows.po
index fcf0c6de1d82d..80100429ab0c9 100644
--- a/Localization/hu/OrchardCore.Workflows.po
+++ b/Localization/hu/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/hu/TheAdmin.po b/Localization/hu/TheAdmin.po
index f44b7fa001728..bddb87d005fb1 100644
--- a/Localization/hu/TheAdmin.po
+++ b/Localization/hu/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/hu/TheAgencyTheme.po b/Localization/hu/TheAgencyTheme.po
index a14b47bcb0665..d1015dd716e70 100644
--- a/Localization/hu/TheAgencyTheme.po
+++ b/Localization/hu/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/hu/TheBlogTheme.po b/Localization/hu/TheBlogTheme.po
index 1e3b035ef8ef8..3709e27ca4be1 100644
--- a/Localization/hu/TheBlogTheme.po
+++ b/Localization/hu/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/hu/TheTheme.po b/Localization/hu/TheTheme.po
index cfcc8d5473856..5e28ddf7c7fec 100644
--- a/Localization/hu/TheTheme.po
+++ b/Localization/hu/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/id/OrchardCore.Admin.po b/Localization/id/OrchardCore.Admin.po
index a7cb4be85dfcb..1ef637f0a3727 100644
--- a/Localization/id/OrchardCore.Admin.po
+++ b/Localization/id/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr ""
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/id/OrchardCore.AdminDashboard.po b/Localization/id/OrchardCore.AdminDashboard.po
index 0afa0ac0af285..3be6ee03d0bce 100644
--- a/Localization/id/OrchardCore.AdminDashboard.po
+++ b/Localization/id/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/id/OrchardCore.AdminMenu.po b/Localization/id/OrchardCore.AdminMenu.po
index 09e21c1bfe94e..32ff6e9c3909e 100644
--- a/Localization/id/OrchardCore.AdminMenu.po
+++ b/Localization/id/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Alias.po b/Localization/id/OrchardCore.Alias.po
index 7d123e874759b..db1b26f16b784 100644
--- a/Localization/id/OrchardCore.Alias.po
+++ b/Localization/id/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/id/OrchardCore.ArchiveLater.po b/Localization/id/OrchardCore.ArchiveLater.po
index 75ffe25dd8d45..f56b9d9f91c55 100644
--- a/Localization/id/OrchardCore.ArchiveLater.po
+++ b/Localization/id/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-10-11 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/id/OrchardCore.AuditTrail.po b/Localization/id/OrchardCore.AuditTrail.po
index 041bae2b1f70e..bc836be108015 100644
--- a/Localization/id/OrchardCore.AuditTrail.po
+++ b/Localization/id/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/id/OrchardCore.Autoroute.po b/Localization/id/OrchardCore.Autoroute.po
index 14fb14f128f14..1c51904e13af1 100644
--- a/Localization/id/OrchardCore.Autoroute.po
+++ b/Localization/id/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/id/OrchardCore.BackgroundTasks.po b/Localization/id/OrchardCore.BackgroundTasks.po
index 266fb9c1aeb67..447648df81a55 100644
--- a/Localization/id/OrchardCore.BackgroundTasks.po
+++ b/Localization/id/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/id/OrchardCore.ContentFields.po b/Localization/id/OrchardCore.ContentFields.po
index 09ad7c8df3630..a71b391148d7d 100644
--- a/Localization/id/OrchardCore.ContentFields.po
+++ b/Localization/id/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/id/OrchardCore.ContentLocalization.po b/Localization/id/OrchardCore.ContentLocalization.po
index c62f6470a1921..addf586e147a3 100644
--- a/Localization/id/OrchardCore.ContentLocalization.po
+++ b/Localization/id/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/id/OrchardCore.ContentPreview.po b/Localization/id/OrchardCore.ContentPreview.po
index 8e7a8365fb489..b8f50d080ea26 100644
--- a/Localization/id/OrchardCore.ContentPreview.po
+++ b/Localization/id/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/id/OrchardCore.ContentTypes.po b/Localization/id/OrchardCore.ContentTypes.po
index bef22ddaadff3..7ce4ada64fcce 100644
--- a/Localization/id/OrchardCore.ContentTypes.po
+++ b/Localization/id/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/id/OrchardCore.Contents.po b/Localization/id/OrchardCore.Contents.po
index 32db34c3204d3..5a92229afb057 100644
--- a/Localization/id/OrchardCore.Contents.po
+++ b/Localization/id/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/id/OrchardCore.CustomSettings.po b/Localization/id/OrchardCore.CustomSettings.po
index 39ec1bd895842..9b8d15fdbceb2 100644
--- a/Localization/id/OrchardCore.CustomSettings.po
+++ b/Localization/id/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/id/OrchardCore.Data.YesSql.po b/Localization/id/OrchardCore.Data.YesSql.po
index e0f48b970859b..3cfa1527e7d3f 100644
--- a/Localization/id/OrchardCore.Data.YesSql.po
+++ b/Localization/id/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Demo.po b/Localization/id/OrchardCore.Demo.po
index 0f44f4da846d8..4b12541c8f4e1 100644
--- a/Localization/id/OrchardCore.Demo.po
+++ b/Localization/id/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/id/OrchardCore.Deployment.Remote.po b/Localization/id/OrchardCore.Deployment.Remote.po
index 9fca6160ce75b..353680d399c2d 100644
--- a/Localization/id/OrchardCore.Deployment.Remote.po
+++ b/Localization/id/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/id/OrchardCore.Deployment.po b/Localization/id/OrchardCore.Deployment.po
index eb9d3b9d52407..7cba1d8deae29 100644
--- a/Localization/id/OrchardCore.Deployment.po
+++ b/Localization/id/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/id/OrchardCore.Diagnostics.po b/Localization/id/OrchardCore.Diagnostics.po
index 35257999bfdef..f0d1822778112 100644
--- a/Localization/id/OrchardCore.Diagnostics.po
+++ b/Localization/id/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2021-07-15 18:36\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/id/OrchardCore.Email.Abstractions.po b/Localization/id/OrchardCore.Email.Abstractions.po
index e8721a1cf0401..d79d67a026af5 100644
--- a/Localization/id/OrchardCore.Email.Abstractions.po
+++ b/Localization/id/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-03-05 10:53\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Email.po b/Localization/id/OrchardCore.Email.po
index bbdc52c8e5ea9..bde924cbb3ed8 100644
--- a/Localization/id/OrchardCore.Email.po
+++ b/Localization/id/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/id/OrchardCore.Facebook.po b/Localization/id/OrchardCore.Facebook.po
index 7a128ebc93382..3e29994493bda 100644
--- a/Localization/id/OrchardCore.Facebook.po
+++ b/Localization/id/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/id/OrchardCore.Features.po b/Localization/id/OrchardCore.Features.po
index e795404f87164..b5520fc963f9e 100644
--- a/Localization/id/OrchardCore.Features.po
+++ b/Localization/id/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Flows.po b/Localization/id/OrchardCore.Flows.po
index b8d3353cee51b..eceba44771947 100644
--- a/Localization/id/OrchardCore.Flows.po
+++ b/Localization/id/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/id/OrchardCore.Forms.po b/Localization/id/OrchardCore.Forms.po
index 0ce5f990d9440..7f57e3ca6300d 100644
--- a/Localization/id/OrchardCore.Forms.po
+++ b/Localization/id/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/id/OrchardCore.GitHub.po b/Localization/id/OrchardCore.GitHub.po
index 1b5b52a0795b8..12b5fee70b8ec 100644
--- a/Localization/id/OrchardCore.GitHub.po
+++ b/Localization/id/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/id/OrchardCore.Google.po b/Localization/id/OrchardCore.Google.po
index 2323472d90cff..e30c210c7fed1 100644
--- a/Localization/id/OrchardCore.Google.po
+++ b/Localization/id/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/id/OrchardCore.Html.po b/Localization/id/OrchardCore.Html.po
index 54d2f40c75600..39702847f4bcf 100644
--- a/Localization/id/OrchardCore.Html.po
+++ b/Localization/id/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/id/OrchardCore.Https.po b/Localization/id/OrchardCore.Https.po
index 15ba2a08e966d..d846d05b935e0 100644
--- a/Localization/id/OrchardCore.Https.po
+++ b/Localization/id/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 16:46\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/id/OrchardCore.Infrastructure.Abstractions.po b/Localization/id/OrchardCore.Infrastructure.Abstractions.po
index 8d595d4f2ad16..ee68e7250aeaa 100644
--- a/Localization/id/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/id/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-03-05 10:53\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/id/OrchardCore.Layers.po b/Localization/id/OrchardCore.Layers.po
index c4e46ec5855d9..1272ebb5a1e83 100644
--- a/Localization/id/OrchardCore.Layers.po
+++ b/Localization/id/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/id/OrchardCore.Liquid.po b/Localization/id/OrchardCore.Liquid.po
index db21b649ae752..87e162faa5830 100644
--- a/Localization/id/OrchardCore.Liquid.po
+++ b/Localization/id/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/id/OrchardCore.Lists.po b/Localization/id/OrchardCore.Lists.po
index e531ed95c0671..871cfc72c8f09 100644
--- a/Localization/id/OrchardCore.Lists.po
+++ b/Localization/id/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/id/OrchardCore.Localization.po b/Localization/id/OrchardCore.Localization.po
index 00883e723abbc..8e856f5048c2c 100644
--- a/Localization/id/OrchardCore.Localization.po
+++ b/Localization/id/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/id/OrchardCore.Markdown.po b/Localization/id/OrchardCore.Markdown.po
index 96e94f956fcfa..87f97860c4f93 100644
--- a/Localization/id/OrchardCore.Markdown.po
+++ b/Localization/id/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/id/OrchardCore.Media.po b/Localization/id/OrchardCore.Media.po
index a3e4c57e88540..be760d5df3801 100644
--- a/Localization/id/OrchardCore.Media.po
+++ b/Localization/id/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,43 +1083,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/id/OrchardCore.Menu.po b/Localization/id/OrchardCore.Menu.po
index f25205dff3046..86a1c65438d83 100644
--- a/Localization/id/OrchardCore.Menu.po
+++ b/Localization/id/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/id/OrchardCore.Microsoft.Authentication.po b/Localization/id/OrchardCore.Microsoft.Authentication.po
index b794e0c45d3e6..0260d56592897 100644
--- a/Localization/id/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/id/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/id/OrchardCore.Navigation.po b/Localization/id/OrchardCore.Navigation.po
index f2cca820ad49f..6b5126cdf6a9a 100644
--- a/Localization/id/OrchardCore.Navigation.po
+++ b/Localization/id/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Notifications.po b/Localization/id/OrchardCore.Notifications.po
index 77bb6540bf4cd..5177afe616cb4 100644
--- a/Localization/id/OrchardCore.Notifications.po
+++ b/Localization/id/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,10 +375,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/id/OrchardCore.OpenId.po b/Localization/id/OrchardCore.OpenId.po
index b37416b7536d1..97f6e48c14f43 100644
--- a/Localization/id/OrchardCore.OpenId.po
+++ b/Localization/id/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/id/OrchardCore.Placements.po b/Localization/id/OrchardCore.Placements.po
index 034c8316d3236..87809d0958624 100644
--- a/Localization/id/OrchardCore.Placements.po
+++ b/Localization/id/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/id/OrchardCore.ProjectTemplates.po b/Localization/id/OrchardCore.ProjectTemplates.po
index d296bb154e35a..1a608b588d944 100644
--- a/Localization/id/OrchardCore.ProjectTemplates.po
+++ b/Localization/id/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/id/OrchardCore.PublishLater.po b/Localization/id/OrchardCore.PublishLater.po
index 1420247672ac4..5ada008b71ae1 100644
--- a/Localization/id/OrchardCore.PublishLater.po
+++ b/Localization/id/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/id/OrchardCore.Queries.po b/Localization/id/OrchardCore.Queries.po
index cbd1710fd2202..c9e37c0bf865b 100644
--- a/Localization/id/OrchardCore.Queries.po
+++ b/Localization/id/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/id/OrchardCore.ReCaptcha.Core.po b/Localization/id/OrchardCore.ReCaptcha.Core.po
index 5d85cebf6fd3c..cfdc5b2bf9a74 100644
--- a/Localization/id/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/id/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2021-07-15 18:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/id/OrchardCore.ReCaptcha.po b/Localization/id/OrchardCore.ReCaptcha.po
index 9d63452cac9ad..b04f701ef1eba 100644
--- a/Localization/id/OrchardCore.ReCaptcha.po
+++ b/Localization/id/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/id/OrchardCore.Recipes.Core.po b/Localization/id/OrchardCore.Recipes.Core.po
index c1784e2ebc22a..8bdaff471c5cc 100644
--- a/Localization/id/OrchardCore.Recipes.Core.po
+++ b/Localization/id/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/id/OrchardCore.Roles.po b/Localization/id/OrchardCore.Roles.po
index ef3a068da02b8..e72a617327ea4 100644
--- a/Localization/id/OrchardCore.Roles.po
+++ b/Localization/id/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/id/OrchardCore.Rules.po b/Localization/id/OrchardCore.Rules.po
index abd4a3e29c512..1691f6c819767 100644
--- a/Localization/id/OrchardCore.Rules.po
+++ b/Localization/id/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/id/OrchardCore.Search.Elasticsearch.po b/Localization/id/OrchardCore.Search.Elasticsearch.po
index 096f1a6f0d398..797d69ea81451 100644
--- a/Localization/id/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/id/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/id/OrchardCore.Search.Lucene.po b/Localization/id/OrchardCore.Search.Lucene.po
index b2bd44e593261..82ac8a88562e3 100644
--- a/Localization/id/OrchardCore.Search.Lucene.po
+++ b/Localization/id/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Search.po b/Localization/id/OrchardCore.Search.po
index 88051f5864f5b..5afbba9201a4c 100644
--- a/Localization/id/OrchardCore.Search.po
+++ b/Localization/id/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/id/OrchardCore.Security.po b/Localization/id/OrchardCore.Security.po
index 81ea37743b80e..a560b2e04936c 100644
--- a/Localization/id/OrchardCore.Security.po
+++ b/Localization/id/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-06-01 18:43\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/id/OrchardCore.Seo.po b/Localization/id/OrchardCore.Seo.po
index 0dd7dc79d3abe..cff1e30c51bf5 100644
--- a/Localization/id/OrchardCore.Seo.po
+++ b/Localization/id/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/id/OrchardCore.Settings.po b/Localization/id/OrchardCore.Settings.po
index 29037aaff28dd..932b48e4964c9 100644
--- a/Localization/id/OrchardCore.Settings.po
+++ b/Localization/id/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/id/OrchardCore.Setup.Core.po b/Localization/id/OrchardCore.Setup.Core.po
index 88f7d9aaefc7c..ee4f5e5682624 100644
--- a/Localization/id/OrchardCore.Setup.Core.po
+++ b/Localization/id/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/id/OrchardCore.Setup.po b/Localization/id/OrchardCore.Setup.po
index 20daec11009a0..d259e50f4846a 100644
--- a/Localization/id/OrchardCore.Setup.po
+++ b/Localization/id/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/id/OrchardCore.Shortcodes.po b/Localization/id/OrchardCore.Shortcodes.po
index 52ba5e35bb9d9..8353b7a06e23a 100644
--- a/Localization/id/OrchardCore.Shortcodes.po
+++ b/Localization/id/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/id/OrchardCore.Sitemaps.po b/Localization/id/OrchardCore.Sitemaps.po
index f8642ff7aeae0..3e4e81e525cfb 100644
--- a/Localization/id/OrchardCore.Sitemaps.po
+++ b/Localization/id/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/id/OrchardCore.Sms.po b/Localization/id/OrchardCore.Sms.po
index 54878eda462ca..b41f1949bb59b 100644
--- a/Localization/id/OrchardCore.Sms.po
+++ b/Localization/id/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/id/OrchardCore.Spatial.po b/Localization/id/OrchardCore.Spatial.po
index 781fa29e221a7..5bea69c33ded5 100644
--- a/Localization/id/OrchardCore.Spatial.po
+++ b/Localization/id/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/id/OrchardCore.Taxonomies.po b/Localization/id/OrchardCore.Taxonomies.po
index 5043c8379287b..a79f084df7c20 100644
--- a/Localization/id/OrchardCore.Taxonomies.po
+++ b/Localization/id/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Templates.Cms.Module.po b/Localization/id/OrchardCore.Templates.Cms.Module.po
index 3d8c34ff5f677..8d27667d298d5 100644
--- a/Localization/id/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/id/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/id/OrchardCore.Templates.po b/Localization/id/OrchardCore.Templates.po
index 5291a787c1659..e13c73047cea6 100644
--- a/Localization/id/OrchardCore.Templates.po
+++ b/Localization/id/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/id/OrchardCore.Tenants.po b/Localization/id/OrchardCore.Tenants.po
index 2a9253b45862a..9402df4e3d79e 100644
--- a/Localization/id/OrchardCore.Tenants.po
+++ b/Localization/id/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/id/OrchardCore.Tests.po b/Localization/id/OrchardCore.Tests.po
index 0802a393d728c..1ac9215574b4b 100644
--- a/Localization/id/OrchardCore.Tests.po
+++ b/Localization/id/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/id/OrchardCore.Themes.po b/Localization/id/OrchardCore.Themes.po
index 6d0853850f7ae..225525711361a 100644
--- a/Localization/id/OrchardCore.Themes.po
+++ b/Localization/id/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/id/OrchardCore.Title.po b/Localization/id/OrchardCore.Title.po
index 6b4f1ead16db9..e87004650e624 100644
--- a/Localization/id/OrchardCore.Title.po
+++ b/Localization/id/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/id/OrchardCore.Twitter.po b/Localization/id/OrchardCore.Twitter.po
index 2d37a611c16a4..bc1caa295b107 100644
--- a/Localization/id/OrchardCore.Twitter.po
+++ b/Localization/id/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/id/OrchardCore.Users.Core.po b/Localization/id/OrchardCore.Users.Core.po
index f042434db6e59..899d5ab24e065 100644
--- a/Localization/id/OrchardCore.Users.Core.po
+++ b/Localization/id/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/id/OrchardCore.Users.po b/Localization/id/OrchardCore.Users.po
index bb2bc6132f034..4196b45b8d7ee 100644
--- a/Localization/id/OrchardCore.Users.po
+++ b/Localization/id/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3416,7 +3488,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3440,16 +3512,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/id/OrchardCore.Widgets.po b/Localization/id/OrchardCore.Widgets.po
index 59ea9158c1d8f..5b19209e93d0b 100644
--- a/Localization/id/OrchardCore.Widgets.po
+++ b/Localization/id/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/id/OrchardCore.Workflows.po b/Localization/id/OrchardCore.Workflows.po
index 8903f777e3e0b..63faf36fc1072 100644
--- a/Localization/id/OrchardCore.Workflows.po
+++ b/Localization/id/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1704,40 +1768,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1834,12 +1912,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1873,7 +1950,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1903,7 +1980,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1915,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1963,7 +2040,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1975,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2005,7 +2082,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2017,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2047,7 +2124,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2059,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2089,7 +2166,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2101,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2137,7 +2214,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2173,7 +2250,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2227,7 +2304,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2239,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2275,7 +2352,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2299,3 +2376,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/id/TheAdmin.po b/Localization/id/TheAdmin.po
index 12700b218c3f8..948dbb3fd814b 100644
--- a/Localization/id/TheAdmin.po
+++ b/Localization/id/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/id/TheAgencyTheme.po b/Localization/id/TheAgencyTheme.po
index b8a2cbfbf6c70..52b7abde0b454 100644
--- a/Localization/id/TheAgencyTheme.po
+++ b/Localization/id/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/id/TheBlogTheme.po b/Localization/id/TheBlogTheme.po
index 3c74e2a4077be..e92631b662d9f 100644
--- a/Localization/id/TheBlogTheme.po
+++ b/Localization/id/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-02-17 17:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/id/TheTheme.po b/Localization/id/TheTheme.po
index dd5822a0bcef2..472a4717c475e 100644
--- a/Localization/id/TheTheme.po
+++ b/Localization/id/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/it/OrchardCore.Admin.po b/Localization/it/OrchardCore.Admin.po
index 9d6e240604dd8..51a3c0bdf283a 100644
--- a/Localization/it/OrchardCore.Admin.po
+++ b/Localization/it/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Amministratore"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Impostazioni amministratore"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Esporta le impostazioni di amministratore."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Benvenuto in Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Naviga il menu e scopri tutte le sue potenzialità."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Abilita la modalità scura del tema amministratore"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Consente di modificare i colori del tema amministratore rendendolo scuro."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Indica se i titoli devono essere visualizzati nella barra superiore."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Amministratore"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/it/OrchardCore.AdminDashboard.po b/Localization/it/OrchardCore.AdminDashboard.po
index 75ed189b6c1c4..3c75c415bb2ea 100644
--- a/Localization/it/OrchardCore.AdminDashboard.po
+++ b/Localization/it/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "No"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Posizione"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Larghezza"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/it/OrchardCore.AdminMenu.po b/Localization/it/OrchardCore.AdminMenu.po
index e73ba3ef89245..d7f49ad4e76c8 100644
--- a/Localization/it/OrchardCore.AdminMenu.po
+++ b/Localization/it/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:21\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Crea menu di amministrazione {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Crea nodo"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Modifica menu di amministrazione {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Modifica nodo"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "La priorità permette di visualizzare questo collegamento come 'attivo' a discapito di un altro link che punta allo stesso indirizzo. Il collegamento col valore maggiore avrà lo stato 'attivo' nel menu di navigazione."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "La posizione di questo collegamento nel menu di amministrazione."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Collegamento"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Il testo del collegamento come verrà mostrato nell'albero."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "L'indirizzo del collegamento. Un collegamento verrà mostrato solo se uno o uno dei figli ha un indirizzo. L'indirizzo sarà relativo al percorso principale (root) del sito di amministrazione"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Scegli un'icona"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Segnaposto"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Il testo della voce di menu come verrà mostrato nell'albero."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Scegli"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Seleziona un'icona da visualizzare quando questa voce di menu è al primo livello."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Scegli un'icona"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Permessi"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Tipo da ricercare"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Seleziona"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Elimina"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Nessun risultato trovato"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "I permessi richiesti per visualizzare questa voce di menu (opzionale)."
diff --git a/Localization/it/OrchardCore.Alias.po b/Localization/it/OrchardCore.Alias.po
index 375d128192548..7c68bc946dcd0 100644
--- a/Localization/it/OrchardCore.Alias.po
+++ b/Localization/it/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "Il tuo alias è già in uso. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Il modello non contiene un'espressione Liquid valida. Dettagli: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Lascia vuoto per generarne uno nuovo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "L'alias verrà generato automaticamente e il campo di input verrà disabilitato"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/it/OrchardCore.ArchiveLater.po b/Localization/it/OrchardCore.ArchiveLater.po
index 41814492f9e05..4bd31dacc2149 100644
--- a/Localization/it/OrchardCore.ArchiveLater.po
+++ b/Localization/it/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "Archivia Dopo"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "Annulla Archivia Dopo"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/it/OrchardCore.AuditTrail.po b/Localization/it/OrchardCore.AuditTrail.po
index 0d7fd9d4740bb..67929335f9a45 100644
--- a/Localization/it/OrchardCore.AuditTrail.po
+++ b/Localization/it/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Log Operazioni"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Tutte le categorie"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Intervallo di tempo personalizzato"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Log Operazioni"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Indica se l'attività di riduzione è disabilitata."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Il numero di giorni in cui un evento viene mantenuto."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/it/OrchardCore.Autoroute.po b/Localization/it/OrchardCore.Autoroute.po
index 6f29242373f5c..a87c21eb5dcad 100644
--- a/Localization/it/OrchardCore.Autoroute.po
+++ b/Localization/it/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Il permalink è troppo lungo. Il permalink può essere lungo al massimo {0} caratteri."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Spunta la casella per disabilitare l'autoroute per questo elemento di contenuto."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Seleziona per specificare che un elemento di contenuto figlio sarà instradato a un percorso assoluto."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/it/OrchardCore.BackgroundTasks.po b/Localization/it/OrchardCore.BackgroundTasks.po
index b4a9ae266cf5e..03a5c1252ce19 100644
--- a/Localization/it/OrchardCore.BackgroundTasks.po
+++ b/Localization/it/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Avanzate"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "Titolo"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "Descrizione"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "La scheda avanzata contiene un valore non valido per il blocco scadenza"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Campo ignorato se la funzione di lock distribuito non è attiva."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/it/OrchardCore.ContentFields.po b/Localization/it/OrchardCore.ContentFields.po
index bf839c869c0ec..ca4f13d54dbcb 100644
--- a/Localization/it/OrchardCore.ContentFields.po
+++ b/Localization/it/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Cambia"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Nessun elemento di contenuto."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Predefinito"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Non pubblicato"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Tipo da ricercare"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Seleziona"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nessun risultato trovato"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Se consentire la selezione di più elementi."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Mostra tutti i tipi di contenuto"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "Tutti i tipi di contenuto legati a questi Stereotipi"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "I tipi di contenuto da visualizzare. Sceglierne almeno uno."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Localizzato"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Inserisci le opzioni dell'editor, il linguaggio è sempre impostato con `html` quando viene salvato."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentazione delle opzioni"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Viene utilizzato il tag img e un url quando si utilizza la funzione \"Inserisci Media\" (normalmente viene utilizzato uno Shortcode)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentazione delle opzioni"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Testo del collegamento"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Se l'URL è obbligatorio."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Usa l'URL del collegamento"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Il testo del suggerimento da visualizzare all'interno del campo URL."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Il testo del suggerimento da visualizzare per il testo del collegamento nell'editor."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Un suggerimento (segnaposto) da visualizzare quando l'input dell'indirizzo del collegamento è vuoto."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Un suggerimento (segnaposto) da visualizzare quando l'input del testo è vuoto."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Un indirizzo internet valido proposto durante la creazione di un elemento di contenuto."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Nessun elemento."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Predefinito"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Non pubblicato"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Tipo da cercare"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Seleziona"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Elimina"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nessun risultato trovato"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Consente di selezionare più elementi."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "I tipi di contenuto da visualizzare. Selezionarne almeno uno."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Elenco Checkbox"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Tipo da ricercare"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Seleziona"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Nessun valore trovato"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ", "
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Modifica dati"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Una rappresentazione JSON dei valori consentiti, es.: {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Intervallo"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Nessuno"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Indicatore"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Un suggerimento da visualizzare quando il campo è vuoto. (opzionale)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Il numero di cifre dopo il punto decimale."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Il valore minimo consentito. (opzionale)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Il valore massimo consentito. (opzionale)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "H6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Inserisci le opzioni dell'editor."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentazione delle opzioni"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Modifica dati"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Una rappresentazione JSON dei valori consentiti, es.: {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Per i secondi usa un divisore di 60 ad esempio '15', per i millisecondi usa un decimale diviso per 1000 ad esempio '0.250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Nessun utente."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Predefinito"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Non abilitato"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Tipo da cercare"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Seleziona"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Elimina"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Nessun risultato trovato"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Se consentire la selezione di più elementi."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Indica se consentire al selettore di visualizzare tutti gli utenti con qualsiasi ruolo."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Obbligatorio"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Suggerimento"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Larghezza"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "La larghezza contenitore del video"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Altezza"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "L'altezza contenitore del video"
diff --git a/Localization/it/OrchardCore.ContentLocalization.po b/Localization/it/OrchardCore.ContentLocalization.po
index b5bd5d008c99b..ff1ef7c50a108 100644
--- a/Localization/it/OrchardCore.ContentLocalization.po
+++ b/Localization/it/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Impossibile creare la versione tradotta dell'elemento di contenuto."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/it/OrchardCore.ContentPreview.po b/Localization/it/OrchardCore.ContentPreview.po
index 36fa0b139ec91..5c54b280ee345 100644
--- a/Localization/it/OrchardCore.ContentPreview.po
+++ b/Localization/it/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Il modello non contiene un'espressione Liquid valida. Dettagli: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Anteprima"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Anteprima disconnessa"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Errore anteprima"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/it/OrchardCore.ContentTypes.po b/Localization/it/OrchardCore.ContentTypes.po
index 669191bc5182c..5b3978a197faf 100644
--- a/Localization/it/OrchardCore.ContentTypes.po
+++ b/Localization/it/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Parti di Contenuto"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Il nome visualizzato non può essere vuoto."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Un tipo con lo stesso nome visualizzato esiste già."
@@ -66,10 +66,10 @@ msgstr "Un tipo con lo stesso nome visualizzato esiste già."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Il nome tecnico non può essere vuoto."
@@ -78,10 +78,10 @@ msgstr "Il nome tecnico non può essere vuoto."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Il nome tecnico deve iniziare con una lettera."
@@ -90,10 +90,10 @@ msgstr "Il nome tecnico deve iniziare con una lettera."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Il nome tecnico contiene dei caratteri non validi."
@@ -101,133 +101,133 @@ msgstr "Il nome tecnico contiene dei caratteri non validi."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "Il Nome Tecnico è riservato per uso interno."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Un tipo con lo stesso nome tecnico esiste già."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Il tipo di contenuto \"{0}\" è stato creato."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\", impostazioni salvate."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\", è stato rimosso."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "La parte di contenuto \"{0}\" è stata aggiunta."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Una parte con lo stesso nome visualizzato esiste già."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Una parte con lo stesso nome tecnico esiste già."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "La parte di contenuto \"{0}\" è stata rimossa."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "La parte di contenuto non può essere creata."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "La parte di contenuto \"{0}\" è stata creata."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Le impostazioni di \"{0}\" sono state salvate."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "Non ci sono campi."
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Un campo con lo stesso nome visualizzato esiste già."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Un campo con lo stesso nome tecnico esiste già."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Il campo \"{0}\" è stato aggiunto."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Nome visualizzato cambiato in {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Le impostazioni del campo \"{0}\" sono state salvate."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Il campo \"{0}\" è stato rimosso."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Le impostazioni per la parte \"{0}\" sono state salvate."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Il nome del tipo di contenuto non può essere vuoto."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Non è possibile aggiungere una parte chiamata '{0}'. Esiste già."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Aggiungi nuovo campo a \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nome del campo che verrà visualizzato a schermo."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Aggiungi una parte con nome a \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Nome della parte riutilizzabile che verrà visualizzato a schermo."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Nome tecnico della parte riutilizzabile."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Esporta le definizioni dei tipi e delle parti di contenuto per aggiornarle."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Nome tecnico della parte."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Il nome della parte che verrà mostrato a schermo. Lasciare vuoto per utilizzare i valori predefiniti."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Seleziona l'opzione per far sì che questa parte possa essere allegata più volte."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Nome tecnico del tipo."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nome del tipo che verrà visualizzato a schermo."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Nuovo Tipo di Contenuto"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nome del tipo che verrà visualizzato a schermo."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Nuova Parte Contenuto"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Crea"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Un elenco separato da virgola di definizioni del tipo di contenuto da eliminare"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Esporta le definizioni dei tipi e delle parti di contenuto per la loro cancellazione."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Modifica Tipo di Contenuto - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Campi"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Modifica"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Elimina"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Modalità di visualizzazione"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "Editor"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Aggiungi campo"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Parti"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Contiene le informazioni dei campi per il tipo di contenuto"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Aggiungi parti"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Aggiungi parte con nome"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Salva"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Elimina"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" impostazioni per \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nome del campo che verrà visualizzato a schermo."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Nome tecnico del campo. Usato per richiamarlo a livello di codice."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Che tipo di editor vuoi usare?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Quale tipo di modalità di visualizzazione vuoi usare?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Salva"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Annulla"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Alcune impostazioni di questa parte, comuni a tutti i tipi, possono essere modificate solo a livello di <a href=\"{0}\">Definizione della Parte</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Nome della parte che verrà visualizzato a schermo."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "La descizione della parte verrà visualizzata a schermo."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Che tipo di editor vuoi usare?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Quale tipo di modalità di visualizzazione vuoi usare?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Salva"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Annulla"
diff --git a/Localization/it/OrchardCore.Contents.po b/Localization/it/OrchardCore.Contents.po
index e3a2e23d3a283..cf7d5283d2afe 100644
--- a/Localization/it/OrchardCore.Contents.po
+++ b/Localization/it/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} è stato sospeso dalla pubblicazione."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Tutti i tipi di contenuto"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Si sono verificati uno o più errori di validazione."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Esporta le impostazioni dei Log Operazioni sui contenuti."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Contenuto"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Fatto"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Log Operazioni"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Indica se il commento al log dell'operazione è mostrato durante la modifica."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "La data in cui l'elemento del contenuto è stato creato o pubblicato per la prima volta."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "Seleziona per poter modificare il proprietario dell'elemento del contenuto. Il permesso <code>EditContentOwner</code> sarà richiesto."
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "e continua"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Azioni"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Contenuto"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Il contenuto è stato salvato come Bozza."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Elemento di contenuto"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Mostra tutti i tipi di contenuto"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Scegli un'icona"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Mostra tutti i tipi di contenuto"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Limita la quantità di elementi di contenuto da fornire da questa sorgente. Nota: solo un tipo di contenuto è selezionabile quando questa opzione è attivata."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "La frequenza predefinita con cui questi tipi di contenuto possono cambiare."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Tutto"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Tutti i tipi di contenuto"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Crea contenuto"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Seleziona se vuoi che l'elemento del contenuto sia pubblicato quando viene creato. Lascia deselezionato per creare una versione in bozza."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Elimina contenuto usando l'espressione: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Visualizza bozza come JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Scarica bozza come JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Visualizza pubblicato come JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Scarica pubblicato come JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Visualizza come JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Indicazioni sull'esporazione di contenuti verso un'istanza di destinazione non trovate. Crea un piano di distribuzione e aggiungi l'esportazione di contenuti verso una destinazione ad esso."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Contenuto"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Aggiungi"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Pubblica contenuto usando l'espressione: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Recupera il contenuto usando l'espressione: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Sospendi la pubblicazione del contenuto usando l'espressione: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Aggiorna contenuto usando l'espressione: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Inserisci un'espressione JavaScript che valuti l'ID dell'elemento contenuto (ContentItemId) da aggiornare. Per esempio: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/it/OrchardCore.CustomSettings.po b/Localization/it/OrchardCore.CustomSettings.po
index 1f41212a4630b..e1632d7b4ab50 100644
--- a/Localization/it/OrchardCore.CustomSettings.po
+++ b/Localization/it/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Impostazioni personalizzate"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutto"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/it/OrchardCore.Data.YesSql.po b/Localization/it/OrchardCore.Data.YesSql.po
index e818d60662f2b..0c941f47c7df9 100644
--- a/Localization/it/OrchardCore.Data.YesSql.po
+++ b/Localization/it/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "Impossibile rimuovere le tabelle."
diff --git a/Localization/it/OrchardCore.Demo.po b/Localization/it/OrchardCore.Demo.po
index 607b62d854ca9..2b47f685b3f12 100644
--- a/Localization/it/OrchardCore.Demo.po
+++ b/Localization/it/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr "MMMM dd, yyyy"
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Nome"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Cognome"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/it/OrchardCore.Deployment.Remote.po b/Localization/it/OrchardCore.Deployment.Remote.po
index 0245e0f3d91c3..c4f25d4d2ac2d 100644
--- a/Localization/it/OrchardCore.Deployment.Remote.po
+++ b/Localization/it/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Invia il piano di distribuzione ad un'istanza remota."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Nome Client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Crea Istanza Remota"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Nome Client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Modifica Client remoto"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Nome Client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Modifica Istanza Remota"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Nome Client"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/it/OrchardCore.Deployment.po b/Localization/it/OrchardCore.Deployment.po
index 3a77b9948d0e3..7706f526cfd87 100644
--- a/Localization/it/OrchardCore.Deployment.po
+++ b/Localization/it/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Importazione JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Elimina"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Piano di distribuzione cancellato con successo."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Il nome è obbligatorio."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Esiste già un piano di distribuzione con lo stesso nome."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Piano di distribuzione aggiornato con successo."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Piano di distribuzione eliminato con successo."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Crea Piano di distribuzione"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Il file personalizzato da aggiungere come parte del piano."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Il nome file verrà aggiunto nell'archivio."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Piani di distribuzione"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutto"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Modifica Piano di distribuzione"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "Ricetta JSON"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Il file ricetta da aggiungere come parte del piano."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Il nome della ricetta."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Il nome visualizzato della ricetta."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "La descrizione della ricetta."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "L'autore della ricetta."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Il sito web della ricetta."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "La versione della ricetta."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Le categorie di ricette (valori separati da virgola)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/it/OrchardCore.Diagnostics.po b/Localization/it/OrchardCore.Diagnostics.po
index cf78d2fec4f2a..28b66b936970a 100644
--- a/Localization/it/OrchardCore.Diagnostics.po
+++ b/Localization/it/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Il tuo browser ha inviato una richiesta che questo server non poteva capire."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Si è verificato un errore durante l'esecuzione della richiesta."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Non puoi accedere a questa risorsa."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Non è stato possibile trovare la pagina."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Non sei autorizzato a visualizzare questo contenuto."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/it/OrchardCore.Email.Abstractions.po b/Localization/it/OrchardCore.Email.Abstractions.po
index 68f1b10115625..136ba801bb214 100644
--- a/Localization/it/OrchardCore.Email.Abstractions.po
+++ b/Localization/it/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Il campo {0} è obbligatorio."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Il metodo di invio '{0}' non è supportato."
diff --git a/Localization/it/OrchardCore.Email.po b/Localization/it/OrchardCore.Email.po
index 0a15f1577edaf..86ab8c3660ea8 100644
--- a/Localization/it/OrchardCore.Email.po
+++ b/Localization/it/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Indirizzo e-mail non valido."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Email Task"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Messaggistica"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Operazione non riuscita"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Invia email"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "L'indirizzo email che indica chi è il mittente dell'email. Lasciare vuoto per utilizzare l'indirizzo email configurato. Supporta sintassi Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Indirizzo email del mittente. Obbligatorio, se diverso dal mittente della mail. Supporta sintassi Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "L'indirizzo email \"Rispondere a\". Obbligatorio, se vuoi che le risposte siano inviate a un indirizzo diverso da quello \"Da\". Supporta sintassi Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "La lista delle email destinatarie separata da virgole. Supporta sintassi Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "La lista separata da virgole degli indirizzi email in copia. Supporta sintassi Liquid."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "La lista separata da virgole degli indirizzi email in copia nascosto. Supporta sintassi Liquid."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Se selezionato, indica che il corpo del messaggio di posta elettronica sarà inviato come HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "A"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Il mittente è facoltativo, è utile quando l'autore dell'email è diverso da quello che invia email."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Ccn"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Cc"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Rispondi a"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Oggetto"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Testo"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Il tenant verrà riavviato quando le impostazioni saranno salvate."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "L'indirizzo email predefinito da usare come mittente, a meno che il mittente non sia impostato."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Altre opzioni di spedizione"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Il dominio del server SMTP, es. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Porta del server SMTP, solitamente la 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Il server proxy è opzionale."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "La porta proxy è opzionale."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Quando questa opzione è selezionata, l'application pool o l'identità del processo host viene utilizzata per autenticarsi con il server di posta."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Il nome utente per l'autenticazione."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Specifica la cartella di recupero dove consegnare le mail"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Es. <i>C:\\Path\\To\\Til suo\\Site\\PickedUpEmail</i> per inserire email in una <i>PickedUpEmail</i> cartella sul disco C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/it/OrchardCore.Facebook.po b/Localization/it/OrchardCore.Facebook.po
index 9929b60040727..e1fe0eeb191a1 100644
--- a/Localization/it/OrchardCore.Facebook.po
+++ b/Localization/it/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Il Facebook Body non contiene un'espressione Liquid valida. Dettagli: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Il Body non contiene un'espressione Liquid valida. Dettagli: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Impostazioni di accesso"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "L'indirizzo rispetto al percorso base dell'applicazione dove verrà rediretto lo user-agent. Il middleware elaborerà questa richiesta quando arriverà."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Il template del plugin, con sintassi Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Versione Javascript SDK"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Avvia su ogni pagina"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/it/OrchardCore.Features.po b/Localization/it/OrchardCore.Features.po
index 6a1de9401493c..09a9b44836030 100644
--- a/Localization/it/OrchardCore.Features.po
+++ b/Localization/it/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funzionalità"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Seleziona uno o più funzionalità."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "Questa funzione è sempre abilitata e non può essere disabilitata."
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} è stato {1}."
@@ -125,9 +125,9 @@ msgstr "Azioni Massive"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Disabilita"
@@ -136,8 +136,8 @@ msgstr "Disabilita"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Abilita"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Non Categorizzato"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "Questa funzione è attivata automaticamente in base alle varie dipendenze e non può essere disabilitata manualmente."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "Questa funzione è disabilitata automaticamente in base alle varie dipendenze e non può essere abilitata manualmente."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "Questa funzione è sempre abilitata e non può essere disabilitata manualmente."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Disabilitando la funzionalità {0}, si disattiveranno anche le seguenti funzionalità:{1}. Vuoi continuare?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Disabilita Funzionalità"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Si"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "No"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Nessun risultato!</strong>Non ci sono elementi collegati alla tua ricerca."
diff --git a/Localization/it/OrchardCore.Flows.po b/Localization/it/OrchardCore.Flows.po
index 52133c6df13db..6a5eef7f382fe 100644
--- a/Localization/it/OrchardCore.Flows.po
+++ b/Localization/it/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr "L'elemento di contenuto Widget con id {0} non ha alcuna definizione di tipo di contenuto corrispondente a {1}."
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Aggiungi elemento"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "I tipi di contenuto che questa Bag può contenere, ad esempio Slide per uno Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr "Gli Stereotipi dei tipi di contenuto che questa Bag può contenere. Puoi definire più Stereotipi usando la virgola (,) come separatore"
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Inserisci Widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Elimina"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Sei sicuro di voler rimuovere questo elemento?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "Non sono stati trovati widget."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/it/OrchardCore.Forms.po b/Localization/it/OrchardCore.Forms.po
index 9a3c81ab25441..54dbfc142f4ee 100644
--- a/Localization/it/OrchardCore.Forms.po
+++ b/Localization/it/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Le opzioni sono scritte in un formato errato."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Aggiungi un Task per la validazione del modello"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validazione"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Task per la compilazione dello stato del modello"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validazione"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Task per la validazione dell'Antiforgery Token"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validazione"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Valido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Non valido"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Task per la validazione dei campi del form"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validazione"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Valido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Non valido"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Task per la validazione del form"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validazione"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Valido"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Non valido"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr "<em>{0}</em>: <em>{1}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Il nome del campo del form che ha un valore non valido."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Associa i campi del form inviati allo stato del modello."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Il testo da mostrare nel bottone."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Tipo del bottone."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr "Il tipo di label da creare per questo campo."
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr "Il testo da visualizzare nella label."
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "L'ID utilizzato per questo elemento del form."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr "Il tipo di validazione da utilizzare per questo campo."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Il nome utilizzato per questo elemento del form."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "L'URL di destinazione del form."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Il metodo HTTP da utilizzare quando si invia il form."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Spunta la casella per generare un Anti Forgery Token all'interno del form."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Tipo del bottone."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Il testo da visualizzare quando il campo non ha valore."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Valore predefinito per questo campo."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Modifica dati"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Una rappresentazione JSON dei valori consentiti, es.: {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr "Lo stile dell'editor da usare per questo campo."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Il testo da visualizzare quando il testo multilinea non ha valore."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Valida <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Il nome del campo da validare."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Controlla se il form inviato contiene degli errori di validazione."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/it/OrchardCore.GitHub.po b/Localization/it/OrchardCore.GitHub.po
index 1b7b8d89073a0..75b49dfa644f3 100644
--- a/Localization/it/OrchardCore.GitHub.po
+++ b/Localization/it/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Impostazioni Autenticazione GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Il Client ID è definito nel tab generale della tua <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "La chiave segreta della tua app."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/it/OrchardCore.Google.po b/Localization/it/OrchardCore.Google.po
index c70f383af0554..a34b81d4be1dd 100644
--- a/Localization/it/OrchardCore.Google.po
+++ b/Localization/it/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Impostazioni Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Impostazioni Google Authentication"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Il Client ID definito nella console delle API di Google per l'applicazione."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "La chiave segreta definita nella console API di Google per l'applicazione."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr "Impostazioni Google Tag Manager"
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/it/OrchardCore.Html.po b/Localization/it/OrchardCore.Html.po
index bcfd01b905b69..363d9a582e426 100644
--- a/Localization/it/OrchardCore.Html.po
+++ b/Localization/it/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Il testo dell'elemento di contenuto."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Inserisci le opzioni dell'editor, il linguaggio è sempre impostato con `html` quando viene salvato."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentazione delle opzioni"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Viene utilizzato il tag img e un url quando si utilizza la funzione \"Inserisci Media\" (normalmente viene utilizzato uno Shortcode)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Inserisci le opzioni dell'editor"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentazione delle opzioni"
diff --git a/Localization/it/OrchardCore.Https.po b/Localization/it/OrchardCore.Https.po
index b108c9fccc7a9..654ee8cdc6577 100644
--- a/Localization/it/OrchardCore.Https.po
+++ b/Localization/it/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Specifica se viene utilizzato un redirect permanente (codice HTTP 308 Spostato permanentemente) invece di un redirect temporaneo (codice HTTP 307 Trovato) quando si reindirizza a HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/it/OrchardCore.Infrastructure.Abstractions.po b/Localization/it/OrchardCore.Infrastructure.Abstractions.po
index af2639ce626a1..50741d0e227cc 100644
--- a/Localization/it/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/it/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2022-08-03 10:04\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "Comando \"{0}\" non trovato"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Una proprietà \"{0}\" esiste ma non è decorata con \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Errore nella conversione del valore \"{0}\" in \"{1}\" per il comando \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Argomenti del comando \"{0}\" non corrispondono alla definizione del comando"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "Il metodo \"{0}\" non supportato dal comando \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/it/OrchardCore.Layers.po b/Localization/it/OrchardCore.Layers.po
index 3e624d61a9909..4d42a6ce4be1d 100644
--- a/Localization/it/OrchardCore.Layers.po
+++ b/Localization/it/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Crea Livello"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Descrizione"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Modifica livello - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "Errore nell'aggiornamento dell'ordine delle regole"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Salva"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Modifica Widget e Livelli"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget spostato con successo. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\">Annulla<strong></strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zone"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Per favore, <a href=\"{0}\">indica una zona</a> prima di aggiungere dei widget"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Aggiungi Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "Non sono stati trovati widget."
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "Non sono stati trovati layer."
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Livelli"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Seleziona un layer per mostrare i widget associati."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Vedi la documentazione"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Modifica"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Elimina"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Per favore, <a href=\"{0}\">crea un livello</a> prima di aggiungere dei widget"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Aggiungi"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Se selezionato, il titolo viene mostrato con il widget."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Il livello a cui il widget viene associato."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/it/OrchardCore.Liquid.po b/Localization/it/OrchardCore.Liquid.po
index 555dfc47c8ebc..989bfcb668765 100644
--- a/Localization/it/OrchardCore.Liquid.po
+++ b/Localization/it/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Il Liquid Body non contiene un'espressione Liquid valida. Dettagli: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/it/OrchardCore.Lists.po b/Localization/it/OrchardCore.Lists.po
index 0e33f2e9986ad..65ac31030f789 100644
--- a/Localization/it/OrchardCore.Lists.po
+++ b/Localization/it/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Rappresenta un link all'elemento di contenuto genitore e l'ordine in cui l'elemento di contenuto è posizionato."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Rappresenta una collezione di elementi di contenuto."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Il Post del Blog specificato non esiste più. Si prega di creare un nuovo Post."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Non sei autorizzato alla cancellazione di questo contenuto"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Il nome utente o l'e-mail o la password forniti non sono corretti."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "La lista è vuota"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "Disabilita la generazione dei Feed RSS."
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Il feed corrente è disponibile all'indirizzo <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "Aggiungi"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Seleziona questa opzione per abilitare l'ordinamento manuale degli elementi."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Liste"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Aggiungi voce di menu genitore"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/it/OrchardCore.Localization.po b/Localization/it/OrchardCore.Localization.po
index 8a927402f632d..594dea19c16ad 100644
--- a/Localization/it/OrchardCore.Localization.po
+++ b/Localization/it/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Lingue"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Una lingua è obbligatoria"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Il sito deve essere riavviato di modo che le impostazioni vengano applicate."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Il linguaggio attivo configurato per il sito."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Impostazioni Traduzione"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Esporta le impostazioni di traduzione."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Aggiungi lingua"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/it/OrchardCore.Markdown.po b/Localization/it/OrchardCore.Markdown.po
index 245462ef3a363..e26d61aab38fe 100644
--- a/Localization/it/OrchardCore.Markdown.po
+++ b/Localization/it/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} non contiene un'espressione Liquid valida. Dettagli: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Il testo dell'elemento di contenuto, con sintassi Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/it/OrchardCore.Media.po b/Localization/it/OrchardCore.Media.po
index 75b4f544b08db..de84ee02c29ab 100644
--- a/Localization/it/OrchardCore.Media.po
+++ b/Localization/it/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Impossibile spostare il file perché esiste già un file con lo stesso nome"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Esiste già un profilo con lo stesso nome."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Profilo elementi multimediali cancellato con successo."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Profilo elementi multimediali rimosso con successo."
@@ -181,95 +181,95 @@ msgstr "Profilo elementi multimediali rimosso con successo."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Predefinito"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Dimensioni personalizzate"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Predefinito (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Max"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Ritaglia"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Pad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "Pad boxato"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Min"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Adatta"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: C'e un errore nella gestione dei file."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Recupera le risorse dalla cartella superiore o da tutte le sotto cartelle."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Crea un profilo immagini"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Il nome del profilo immagini."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Il suggerimento per il profilo immagini."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Seleziona la larghezza per l'immagine elaborata. Se non vengono inseriti valori, la larghezza sarà calcolata sulla base degli altri dati."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Seleziona l'altezza per l'immagine elaborata. Se non vengono inseriti valori, l'altezza sarà calcolata sulla base degli altri dati."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Selezionare la modalità di ridimensionamento per l'immagine elaborata."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Seleziona il colore di sfondo per l'immagine elaborata. Un valore vuoto significa che un comando bgcolor non sarà applicato. Esempi di valori validi: 'bianco', 'ffff00', 'ff0080', '128,64,32' e '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Seleziona il formato per l'immagine elaborata. Se non vengono inseriti valori, il formato dell'immagine non sarà modificato."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Modifica profilo immagini"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Il nome del profilo immagini."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Il suggerimento per il profilo multimediale."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Seleziona la larghezza per l'immagine elaborata. Se non vengono inseriti valori, la larghezza sarà calcolata sulla base degli altri dati."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Seleziona l'altezza per l'immagine elaborata. Se non vengono inseriti valori, l'altezza sarà calcolata sulla base degli altri dati."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Selezionare la modalità di ridimensionamento per l'immagine elaborata."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Seleziona il colore di sfondo per l'immagine elaborata. Un valore vuoto significa che un comando bgcolor non sarà applicato. Esempi di valori validi: 'bianco', 'ffff00', 'ff0080', '128,64,32' e '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Seleziona il formato per l'immagine elaborata. Se non vengono inseriti valori, il formato dell'immagine non sarà modificato."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Inverti Selezione"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Crea Cartella"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Rinomina Elemento"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "File"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutti"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Esporta tutti i file o quelli selezionati."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Piccole Miniature"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Grandi Miniature"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Allegato"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Piccole Miniature"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Grandi Miniature"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Seleziona File"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "OK"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Indica se selezionare un punto di collegamento per il ridimensionamento è consentito."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/it/OrchardCore.Menu.po b/Localization/it/OrchardCore.Menu.po
index edebccfaf6c66..50050f015158e 100644
--- a/Localization/it/OrchardCore.Menu.po
+++ b/Localization/it/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menu"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Elemento di menu eliminato con successo."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "La pubblicazione di questo elemento di contenuto potrebbe cancellare il contenuto creato. Risolvi prima qualsiasi problema con il tipo di contenuto."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Modifica {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Vedi la documentazione"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Testo"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/it/OrchardCore.Microsoft.Authentication.po b/Localization/it/OrchardCore.Microsoft.Authentication.po
index 28e7297fdf8c4..373c42528eb5a 100644
--- a/Localization/it/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/it/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Impostazioni di autenticazione account Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "L'ID Applicazione presente nel portale dello sviluppatore Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "La chiave segreta dell'applicazione presente nei parametri del portale dello sviluppatore Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/it/OrchardCore.Navigation.po b/Localization/it/OrchardCore.Navigation.po
index 6a2e15c885093..9d6662b2f8738 100644
--- a/Localization/it/OrchardCore.Navigation.po
+++ b/Localization/it/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr "<<"
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr "<"
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ">"
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ">>"
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr "..."
diff --git a/Localization/it/OrchardCore.Notifications.po b/Localization/it/OrchardCore.Notifications.po
index 032fe0d453d2f..f8f4ec957c455 100644
--- a/Localization/it/OrchardCore.Notifications.po
+++ b/Localization/it/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr "Attività Notifica Del Proprietario Del Contenuto"
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr "Attività Notifica Utente"
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "Notifiche"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr "Fatto"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr "Fallito"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr "Fallito: nessun utente trovato"
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr "Letto"
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr "Non letto"
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr "Creati di recente"
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr "Creati in precedenza"
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "Segna come non letto"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr "Rimuovi"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] "notifica"
 msgstr[1] "notifiche"
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr "{0} {1} non letto con successo."
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr "{0} {1} letto con successo."
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr "{0} {1} rimosso con successo."
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr "Segna come letto"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr "Nessuna notifica."
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr "selezionato"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] "1 elemento"
 msgstr[1] "{0} elementi"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr "Elementi da {0} a {1}"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "Elimina"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
-msgstr "Notifica utente"
+msgid "Notify Content Owner"
+msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "È possibile utilizzare la sintassi Liquid."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "Il Corpo del testo non supporta HTML. Devi utilizzare sintassi Liquid."
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,11 +378,11 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "Quando selezionato, il provider di notifica utilizzerà il corpo HTML se supporta HTML."
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
-msgstr "Notifica proprietario"
+msgid "Notify Content Owner"
+msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:2
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr "Notifica utente"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "È possibile utilizzare la sintassi Liquid."
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "Il Corpo del testo non supporta HTML. Devi utilizzare sintassi Liquid."
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "Quando selezionato, il provider di notifica utilizzerà il corpo HTML se supporta HTML."
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] "notifica"
-msgstr[1] "notifiche"
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr "Hai più di {0} non letti {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr "Hai {0}, non letti {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
-msgstr "Non hai notifiche non lette"
+msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
-msgstr "Centro notifiche"
+msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/it/OrchardCore.OpenId.po b/Localization/it/OrchardCore.OpenId.po
index 12348363b3003..73bf84cf1630d 100644
--- a/Localization/it/OrchardCore.OpenId.po
+++ b/Localization/it/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Il nome è già stato preso da un altro ambito."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Configurazione server OpenID aggiornata con successo."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Validazione della configurazione OpenID aggiornata con successo."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Crea una nuova applicazione"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Client Id"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Le applicazioni confidenziali DEVONO inviare il loro client secret quando comunicano con token e Revocation Endpoint. Questo garantisce che solo il cliente legittimato possa scambiare un codice di autorizzazione o ottenere un refresh token."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Consenti l'aggiornamento del Token Flow"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Consenti Logout Endpoint"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr "Assicurarsi che l'applicazione client e la libreria OAuth o OIDC in uso supportino PKCE prima di abilitare questa opzione."
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Creare un nuovo ambito"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Nota: il server tenant è sempre incluso nel parco dei token di accesso, anche se non è richiesto alcun ambito."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Modifica un'applicazione"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Client Id"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Le applicazioni confidenziali DEVONO inviare il loro client secret quando comunicano con token e Revocation Endpoint. Questo garantisce che solo il cliente legittimato possa scambiare un codice di autorizzazione o ottenere un refresh token."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Client Secret"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Consenti l'aggiornamento del Token Flow"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr "Assicurati che la libreria client/client supporti PKCE prima di abilitare questa opzione."
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Modifica ambito"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Nota: il server tenant è sempre incluso nel parco dei token di accesso, anche se non è richiesto alcun ambito."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Il tenant verrà riavviato quando le impostazioni saranno salvate."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Nome visualizzato dell'IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Autorità da utilizzare quando si effettuano chiamate OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "il 'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "L'indirizzo rispetto al percorso base dell'applicazione dove verrà rediretto lo user-agent. Il middleware elaborerà questa richiesta quando arriverà."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Vedi post_logout_redirect_uri da "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "La uri in cui lo user agent verrà reindirizzato dopo che l'applicazione è stata disconnessa dall'Identity Provider. Il reindirizzamento avverrà dopo che verrà invocato il SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Flusso del codice di autenticazione"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "vedi: "
@@ -1217,15 +1217,15 @@ msgstr "Usa il 'code' per il tipo di risposta"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "esempio:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Usa il 'code token' per il tipo di risposta"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Flusso di autenticazione implicito"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Usa l' 'id_token' per il tipo di risposta"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Usa l' 'id_token token' per il tipo di risposta"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Modalità di risposta"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Configura la modalità risposta: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Client Secret"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "imposta il codice client secret."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr "Nome parametro"
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr "Valore"
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr "Rimuovi parametro dall'elenco"
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr "Aggiungi un parametro"
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr "Modifica dati"
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr "Parametri"
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Una rappresentazione JSON dei valori consentiti, es.: {0}"
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "OK"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr "Parametri Avanzati"
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr "Parametri avanzati che possono essere inviati con la richiesta di autorizzazione."
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Queste opzioni sono tutte facoltative e sono solo per utenti esperti."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "L'URL di base dell' identity server (questo sito). Se non compilato, il campo assumerà il valore dell'host del sito."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "Selezionare la posizione del certificato di cifratura."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "Selezionare l'archivio dei certificati di cifratura."
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "È necessario aggiungere un certificato al server per impostare il modulo OpenID Connect."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "Seleziona la posizione della firma del certificato."
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "Seleziona la firma dell'archivio dei certificati."
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "Quando questa opzione è abilitata, il refresh token non sono marcati come riscattati e possono essere riutilizzati fino alla loro scadenza."
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Il tenant verrà riavviato quando le impostazioni saranno salvate."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Server di autorizzazione del tenant"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "L'indirizzo del server remoto OpenID Connect. Usare un indirizzo HTTPS è fortemente raccomandato."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr "L'URI ben formato dell'endpoint OpenID Connect Metadata. Questo è solo per scenari avanzati quando i metadati non sono disponibili dall'endpoint dell'autorità standard. Non può essere utilizzato quando si utilizza un Tenant e l'utilizzo di un indirizzo HTTPS è fortemente raccomandato."
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/it/OrchardCore.Placements.po b/Localization/it/OrchardCore.Placements.po
index e7b95fa95ea60..5e33cb007612e 100644
--- a/Localization/it/OrchardCore.Placements.po
+++ b/Localization/it/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "Regole di posizionamento per \"{0}\" già esistenti. Si prega di modificare la regola esistente."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "Il posizionamento \"{0}\" è stato salvato."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "Il posizionamento \"{0}\" è vuoto."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "Il posizionamento \"{0}\" è stato rimosso."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "Si è verificato un errore durante l'elaborazione del posizionamento<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "Si è verificato un errore durante l'elaborazione del posizionamento."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "Posizionamento rimosso con successo."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "Modifica posizionamento"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "Il tipo della shape utilizzato per mostrare l'elemento."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/it/OrchardCore.ProjectTemplates.po b/Localization/it/OrchardCore.ProjectTemplates.po
index 2b68d948f5bb8..bc4b1fe1d4daf 100644
--- a/Localization/it/OrchardCore.ProjectTemplates.po
+++ b/Localization/it/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 20:27\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Mostra"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/it/OrchardCore.PublishLater.po b/Localization/it/OrchardCore.PublishLater.po
index 3a790fdfb359f..1a3253174bd6b 100644
--- a/Localization/it/OrchardCore.PublishLater.po
+++ b/Localization/it/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 20:27\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Pubblica più tardi"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Annulla la pubblicazione rimandata"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/it/OrchardCore.Queries.po b/Localization/it/OrchardCore.Queries.po
index cbbdf340eda68..be2d48e660025 100644
--- a/Localization/it/OrchardCore.Queries.po
+++ b/Localization/it/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Esegui Query SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Si è verificato un errore durante l'esecuzione della query SQL: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL Query"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "La query SQL utilizza la sintassi standard SQL92 e viene convertita in base al database attuale. Le tabelle saranno impostate automaticamente."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Query"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Nome tecnico della query. Usato per richiamarla a livello di codice."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr "Se selezionato, dovrai dichiarare manualmente le variabili per i contenuti referenziati dai campi selettore dei contenuti, i campi Tassonomia, Tag ed Elenco degli ID e sostituirli dove necessario nella ricetta. Qualsiasi riferimento a questi elementi di contenuto sarà perso."
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr "Nota: La Query deve essere configurata per restituire i Documenti."
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Quando selezionato, il risultato deve essere un elenco di id documento."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/it/OrchardCore.ReCaptcha.Core.po b/Localization/it/OrchardCore.ReCaptcha.Core.po
index 05bbd5d68e094..2cd8377de1878 100644
--- a/Localization/it/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/it/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Impossibile convalidare il captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Impossibile convalidare il captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Lingua con nome {0} non trovata"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/it/OrchardCore.ReCaptcha.po b/Localization/it/OrchardCore.ReCaptcha.po
index 2ee62474b9aeb..5989a03a5ac28 100644
--- a/Localization/it/OrchardCore.ReCaptcha.po
+++ b/Localization/it/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Esporta le impostazioni ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Task validazione ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validazione"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Valido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Non valido"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Convalida Captcha non riuscita. Riprova."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Il tenant verrà riavviato quando le impostazioni saranno salvate."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Chiave del sito reCaptcha di Google."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/it/OrchardCore.Recipes.Core.po b/Localization/it/OrchardCore.Recipes.Core.po
index 43dd7d24e50da..e95dec115bd0c 100644
--- a/Localization/it/OrchardCore.Recipes.Core.po
+++ b/Localization/it/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-01-10 14:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/it/OrchardCore.Roles.po b/Localization/it/OrchardCore.Roles.po
index e7424c4e00ee1..8de62d51a0794 100644
--- a/Localization/it/OrchardCore.Roles.po
+++ b/Localization/it/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Ruoli"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Nome ruolo non valido."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Ruolo aggiornato correttamente."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Impossibile eliminare un ruolo di sistema."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Crea Ruolo"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Nome ruolo"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Modifica Dettagli Ruolo"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Permesso"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Il permesso cloud consente agli utenti di ottenere altre autorizzazioni. Concedetelo con estrema attenzione."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Ruoli"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/it/OrchardCore.Rules.po b/Localization/it/OrchardCore.Rules.po
index e6e44279a7941..3b1a76cd95b47 100644
--- a/Localization/it/OrchardCore.Rules.po
+++ b/Localization/it/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-21 06:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Tutti"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Qualsiasi"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Aggiungi"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "Tipo di contenuto"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "Selezionare l'operatore della regola."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Lingua"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Selezionare l'operatore condizionale."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr "Javascript"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "Ruolo"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Selezionare l'operatore condizionale."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Selezionare l'operatore condizionale."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/it/OrchardCore.Search.Elasticsearch.po b/Localization/it/OrchardCore.Search.Elasticsearch.po
index 4f1cc39bbaf5b..fceb11e8e9c69 100644
--- a/Localization/it/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/it/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,127 +56,127 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr "Elasticsearch"
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr "Reimposta"
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr "Ricostruisci"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr "Elimina"
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr "Un indice chiamato {0} esiste già."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "Un indice chiamato {0} non esiste."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "Si è verificato un errore durante la creazione dell'indice."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "Indice <em>{0}</em> creato con successo."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr "Si è verificato un errore durante la modifica dell'indice."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
-msgstr "Indice <em>{0}</em> modificato con successo, <strong>si prega di eseguire una ricostruzione dell'indice.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
+msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "Indice <em>{0}</em> resettato con successo."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "Indice <em>{0}</em> ricostruito con successo."
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr "Indice non trovato sul server Elasticsearch."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "Indice <em>{0}</em> eliminato con successo."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "Errore durante l'eliminazione dell'indice."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Query non valida : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr "Indice rimosso con successo."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
-msgstr "È necessario selezionare almeno un tipo di contenuto."
+msgid "At least one content type is required."
+msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr "Il nome dell'indice è obbligatorio."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
-msgstr "Il nome dell'indice contiene caratteri non consentiti."
+msgid "The index name contains forbidden characters."
+msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
 #: OrchardCore.Search.Elasticsearch\Drivers\ElasticQueryDisplayDriver.cs:65
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr "Il campo indice è obbligatorio"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr "Modifica Indice Elasticsearch"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr "Vedi la documentazione"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr "La lingua del contenuto che verrà indicizzata."
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr "I tipi di contenuto da indicizzare. Selezionarne almeno uno."
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr "Ricostruisci indici di ricerca Elasticsearch"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutti"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr "Tutti"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr "Esegui"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr "Seleziona per far ritornare gli elementi di contenuto corrispondenti."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,53 +572,53 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr "Query Elasticsearch"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
+msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
+msgstr ""
+
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
 msgid "Default search index"
 msgstr "Indice di ricerca predefinito"
 
 #. <span class="hint">@T["The default index to use for the search page."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
 msgid "The default index to use for the search page."
 msgstr "L'indice predefinito da utilizzare per la pagina di ricerca."
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
-msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
-msgstr "Devi creare almeno un indice da impostare come indice di ricerca."
-
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
-msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
-msgstr "Campi di ricerca predefiniti"
-
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
-msgstr "Un elenco di campi separato da virgole da utilizzare per le pagine di ricerca. Il valore predefinito è <code>Content.ContentItem.FullText</code>."
+msgid "Default search type"
+msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
-msgstr "Permetti Elasticsearch \"query string\" nei moduli di ricerca"
+msgid "Default query"
+msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
-msgstr "Indica se le query di ricerca sono autorizzate ad usare <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Sintassi per query Elasticsearch</a>."
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
+msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
-msgstr "Vedi la documentazione"
+msgid "Default searched fields"
+msgstr "Campi di ricerca predefiniti"
+
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
+msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
+msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticSettingsDeploymentStep.Fields.Edit.cshtml:3
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr "Mappature indici Elasticsearch"
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr "Query Elasticsearch"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr "L'indice Elasticsearch su cui effetuare la ricerca"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr "La query di ricerca utilizza la sintassi Elasticsearch. La documentazione è disponibile qui <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/it/OrchardCore.Search.Lucene.po b/Localization/it/OrchardCore.Search.Lucene.po
index c074a53a533bc..4a627409dce89 100644
--- a/Localization/it/OrchardCore.Search.Lucene.po
+++ b/Localization/it/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr "Lucene"
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr "Reimposta"
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr "Ricostruisci"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr "Elimina"
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr "Qualsiasi lingua"
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr "Un indice chiamato {0} esiste già."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "Un indice chiamato {0} non esiste."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "Si è verificato un errore durante la creazione dell'indice."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "Indice <em>{0}</em> creato con successo."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr "Si è verificato un errore durante la modifica dell'indice."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr "Indice <em>{0}</em> modificato con successo, <strong>si prega di eseguire una ricostruzione dell'indice.</strong>"
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "Indice <em>{0}</em> resettato con successo."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "Indice <em>{0}</em> ricostruito con successo."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "Indice <em>{0}</em> eliminato con successo."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "Errore durante l'eliminazione dell'indice."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Query non valida : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr "Indice rimosso con successo."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr "È necessario selezionare almeno un tipo di contenuto."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr "Il nome dell'indice è obbligatorio."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr "Il nome dell'indice contiene caratteri non consentiti."
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr "Lucene"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr "Modifica Indice Lucene"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr "Nome Indice"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr "Nome Analizzatore"
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr "La lingua del contenuto che verrà indicizzata."
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr "I tipi di contenuto da indicizzare. Selezionarne almeno uno."
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr "Indici Ricerca Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutti"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr "Ricostruisci indici di ricerca Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutti"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr "Reimposta indici di ricerca Lucene"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tutti"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr "Esegui"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr "Seleziona per far ritornare gli elementi di contenuto corrispondenti."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr "Query Lucene"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr "Devi creare almeno un indice da impostare come indice di ricerca."
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr "Query Lucene"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr "L'indice Lucene su cui effetuare la ricerca"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr "La query di ricerca utilizza la sintassi Elasticsearch. La documentazione è disponibile qui <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr "Crea"
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr "I risultati visualizzati provengono dai campi memorizzati in Lucene."
diff --git a/Localization/it/OrchardCore.Search.po b/Localization/it/OrchardCore.Search.po
index edb927042108a..34195d6704711 100644
--- a/Localization/it/OrchardCore.Search.po
+++ b/Localization/it/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr "Il provider di ricerca predefinito da usare per la pagina di ricerca."
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/it/OrchardCore.Security.po b/Localization/it/OrchardCore.Security.po
index 7036fc5f2eb7f..7e1205260f882 100644
--- a/Localization/it/OrchardCore.Security.po
+++ b/Localization/it/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-21 06:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr "Le impostazioni correnti provengono da configurazioni presenti nei sorgenti, il salvataggio delle impostazioni influenzerà le impostazioni amministrative (AdminSettings) non la configurazione."
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr "Consente agli amministratori di controllare le risorse che il browser (User Agent) può caricare per una determinata pagina."
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr "Consente a un sito di controllare quali funzioni e API possono essere utilizzate in un browser."
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/it/OrchardCore.Seo.po b/Localization/it/OrchardCore.Seo.po
index 1d53c8b5a59d0..9c0c31614b899 100644
--- a/Localization/it/OrchardCore.Seo.po
+++ b/Localization/it/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "Indica se usare i metadati per questa pagina."
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr "Sovrascrivi il titolo predefinito della pagina generato dal browser (si raccomanda di tenersi sotto i 70 caratteri)."
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr "La meta descrizione da visualizzare per questa pagina."
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr "Le meta parole chiave da visualizzare per questa pagina, separate da virgola."
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr "Sovrascrivi l'url canonico predefinito."
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Modifica dati"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr "Le impostazioni Google Schema dei Social Meta vengono utilizzate per impostazione predefinita o possono essere sovrascritte qui."
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr "Le impostazioni dei Social Meta vengono utilizzate per impostazione predefinita o possono essere sovrascritte qui."
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Il Title (e quindi il Page Title) è usato per impostazione predefinita, o può essere sovrascritto qui."
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr "Spunta la casella per visualizzare il pannello Schema di Google."
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Il Title (e quindi il Page Title) è usato per impostazione predefinita, o può essere sovrascritto qui."
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr "La Meta Description è usata per impostazione predefinita, o può essere sovrascritta qui."
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr "Le impostazioni Social Meta della card di Twitter è utilizzata per impostazione predefinita, o possono essere sovrascritte qui."
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr "Le impostazioni Social Meta della Creator di Twitter è utilizzata per impostazione predefinita, o possono essere sovrascritte qui."
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/it/OrchardCore.Settings.po b/Localization/it/OrchardCore.Settings.po
index d0a22443d9e19..ce41b6c23d6b8 100644
--- a/Localization/it/OrchardCore.Settings.po
+++ b/Localization/it/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Impostazioni del sito aggiornate con successo."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr "La dimensione della pagina deve essere superiore a zero."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr "La dimensione della pagina deve essere inferiore o uguale a {0}."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "L'url di base deve essere una URL fully qualified."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Impostazioni Sito"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/it/OrchardCore.Setup.Core.po b/Localization/it/OrchardCore.Setup.Core.po
index 096c178d1761b..8fb4f30093adf 100644
--- a/Localization/it/OrchardCore.Setup.Core.po
+++ b/Localization/it/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr "L'impostazione del DatabaseProvider è obbligatoria."
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr "Il provider di database fornito non è supportato."
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "La stringa di connessione fornita non è valida o il server non è raggiungibile."
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "Il database, il prefisso della tabella e lo schema sono già in uso."
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/it/OrchardCore.Setup.po b/Localization/it/OrchardCore.Setup.po
index 7973b0c481457..ad071862d8e39 100644
--- a/Localization/it/OrchardCore.Setup.po
+++ b/Localization/it/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "La password deve avere almeno {0} caratteri."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Non è possibile creare un sito senza ricetta."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Questo dato verrà usato come titolo predefinito delle tue pagine."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Le ricette ti permettono di configurare il tuo sito con opzioni, funzionalità e impostazioni aggiuntive."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Impostando il fuso orario predefinito esso verrà utilizzato quando si visualizzano e si modificano date e orari."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Il database viene utilizzato per memorizzare la configurazione del sito e il suoi contenuti."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Puoi specificare un prefisso della tabella se sei intenzionato a riutilizzare lo stesso database per più siti."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Mostra/nascondi stringa di connessione"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "L'amministratore ha tutti i diritti. Dovrebbe essere utilizzato solo durante il Setup e per il ripristino a seguito di problemi gravi."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Nome utente"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "L'email non è valida."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Sicurezza password"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/it/OrchardCore.Shortcodes.po b/Localization/it/OrchardCore.Shortcodes.po
index 40d5623115c8e..5316a26a1f6de 100644
--- a/Localization/it/OrchardCore.Shortcodes.po
+++ b/Localization/it/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Il contenuto del template è obbligatorio."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Il template non contiene un'espressione Liquid valida. Dettaglio: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Modello di shortcode eliminato con successo."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Modelli di shortcode rimossi con successo."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "Crea Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "Il nome dello shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "La suggerimento per la compilazione dello shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "Esempio di utilizzo dello shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "Le categorie per questo shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "Il valore predefinito dello shortcode, quando selezionato. Predefinito a [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "Modifica Shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "Il nome dello shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "La suggerimento per la compilazione dello shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "Esempio di utilizzo dello shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "Le categorie per questo shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "Il valore predefinito dello shortcode, quando selezionato. Predefinito a [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/it/OrchardCore.Sitemaps.po b/Localization/it/OrchardCore.Sitemaps.po
index b7ed065821717..0800f366ec345 100644
--- a/Localization/it/OrchardCore.Sitemaps.po
+++ b/Localization/it/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le impostazione del sito 'Base url' è vuota, la proprietà è obbligatoria per generare sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le impostazione del sito 'Base url' è vuota, la proprietà è obbligatoria per generare sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Deseleziona per disabilitare l'instradamento all'indice della sitemap."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr "Path Personalizzato della mappa del sito"
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr "Il path da aggiungere alla mappa del sito. es. path/to/something"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr "La frequenza predefinita con cui questo path cambierà."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le impostazione del sito 'Base url' è vuota, la proprietà è obbligatoria per generare sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Le impostazione del sito 'Base url' è vuota, la proprietà è obbligatoria per generare sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Deseleziona per disabilitare l'instradamento all'indice della sitemap."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Spunta la casella per escludere questo contenuto dalla sitemap."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "La frequenza con cui questo elemento cambia."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/it/OrchardCore.Sms.po b/Localization/it/OrchardCore.Sms.po
index 5a61230cbdc3d..2f4e226ad5747 100644
--- a/Localization/it/OrchardCore.Sms.po
+++ b/Localization/it/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/it/OrchardCore.Spatial.po b/Localization/it/OrchardCore.Spatial.po
index a3d8b28ae2986..9b1811339326a 100644
--- a/Localization/it/OrchardCore.Spatial.po
+++ b/Localization/it/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-21 06:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr "Il campo {0} è obbligatorio."
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr "Latitudine"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "Editor Leaflet"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr "Latitudine"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se un valore è obbligatorio."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/it/OrchardCore.Taxonomies.po b/Localization/it/OrchardCore.Taxonomies.po
index a1f91de94c4ff..ee9af05b2cb85 100644
--- a/Localization/it/OrchardCore.Taxonomies.po
+++ b/Localization/it/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "È richiesto un valore per '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Filtri Tassonomia"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Tags"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Impossibile trovare la tassonomia. Controlla le impostazioni per questo campo."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Errore nella creazione dell'etichetta"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Tipo da cercare"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Seleziona"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Premi Invio per creare un tag"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Nessun tag trovato"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Tags"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Impossibile trovare la tassonomia. Controlla le impostazioni per questo campo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Il testo del suggerimento da visualizzare per questo campo nell'editor."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Tassonomia"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Obbligatorio"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Se si vuole che almeno un elemento sia selezionato."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unico"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Se si vuole che solo un elemento possa essere selezionato."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Solo le foglie"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Se si vuole che le foglie siano gli unici elementi che possono essere selezionati."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Indica se è possibile creare nuovi tag in linea. Nota: quando si creano tag in linea verrà impostata solo la proprietà display text dell'elemento."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Tipo di contenuto da usare per i termini della tassonomia"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Aggiungi {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Hai riorganizzato la tassonomia."
diff --git a/Localization/it/OrchardCore.Templates.Cms.Module.po b/Localization/it/OrchardCore.Templates.Cms.Module.po
index 4bf42227b4f3d..e917de4fdbb05 100644
--- a/Localization/it/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/it/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Mostra"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/it/OrchardCore.Templates.po b/Localization/it/OrchardCore.Templates.po
index 61b01b0e88574..9d3e0f1fe4db0 100644
--- a/Localization/it/OrchardCore.Templates.po
+++ b/Localization/it/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Il template \"{0}\" è stato creato."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Template eliminato con successo."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Template rimosso con successo."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "Tutti i modelli di frontend"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Anteprima"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Il nome del modello di frontend."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "La descrizione del modello di frontend."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Anteprima"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Il nome del modello di frontend."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "La descrizione del modello di frontend."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/it/OrchardCore.Tenants.po b/Localization/it/OrchardCore.Tenants.po
index 1ae9ab9df1651..fd4560aacbff0 100644
--- a/Localization/it/OrchardCore.Tenants.po
+++ b/Localization/it/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Tenants"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "Tutti"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Tutti gli stati"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "In esecuzione"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Disabilitato"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Non inizializzato"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Nome"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Stato"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Disabilita"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Abilita"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Non puoi disattivare il tenant di default."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Il tenant '{0}' è già disabilitato."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Il tenant '{0}' è già abilitato."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr "Puoi solo disabilitare un tenant in esecuzione."
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Puoi abilitare solo un tenant disabilitato."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr "Puoi rimuovere solo un tenant 'Disabilitato' o 'Non inizializzato'."
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr "Si é verificato un errore nel tentativo di rimuovere il tenant '{0}'. {1}"
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr "Il tenant '{0}' è stato rimosso, vedere il file di log per ulteriori informazioni."
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr "Puoi solo disabilitare un tenant in esecuzione."
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Puoi abilitare solo un tenant disabilitato."
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr "Puoi rimuovere solo un tenant 'Disabilitato' o 'Non inizializzato'."
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr "Si é verificato un errore nel tentativo di rimuovere il tenant '{0}'."
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "Il nome utente '{0}' non è valido, può contenere solo lettere o cifre."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "L'email non è valida."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Tenant non trovato: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Il tenant non può essere configurato."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Non è stato definito il database provider."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr "Il provider di database fornito non è supportato."
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "La stringa di connessione è obbligatoria per questo database provider."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "O 'Recipe' o 'RecipeName' è obbligatorio."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Ricetta '{0}' non trovata."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr "Il nome del tenant è obbligatorio."
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr "Il profilo delle funzionalità non esiste."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr "Nome del tenant non valido. Deve contenere solo caratteri e non spazi."
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr "Host e prefisso URL non possono essere entrambi vuoti."
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr "Il prefisso URL non può contenere più di un segmento."
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr "Esiste già un tenant con lo stesso host e prefisso."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr "Il nome del tenant è in conflitto con il tenant 'Default'."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr "Esiste già un tenant con lo stesso nome."
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr "Il tenant esistente da convalidare non è stato trovato."
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr "Il provider di database fornito non è supportato."
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "La stringa di connessione fornita non è valida o il server non è raggiungibile."
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr "Il database relativo è già in uso."
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "Il database, il prefisso della tabella e lo schema sono già in uso."
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr "E' possibile specificare quali presets possono essere usate per la procedura di Setup."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr "La stringa di connessione alla tua istanza di database, es. {0}."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr "Prefisso Tabelle"
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr "Stringa di connessione"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr "Opzionale, specificare quale profilo di funzionalità abilitate o meno deve essere applicato a questo tenant."
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr "La categoria del tenant."
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr "(Opzionale) Esempio: Se il prefisso è \"site1\", l'URL del tenant con il prefisso sarà \"https://orchardcore.net/site1\"."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr "La descrizione del tenant."
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Crea Tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Crea Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Seleziona il nome del tenant da creare."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(facoltativo) la descrizione del tenant da creare."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr "(Opzionale) Esempio: Se il prefisso è \"site1\", l'URL del tenant con il prefisso sarà \"http://orchardproject.net/site1\"."
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Esempio: Se l'host è \"orchardproject.net\", l'URL del tenant sarà \"http://orchardproject.net/\". Supporta sintassi Liquid."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Che tipo di database utilizzare?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Prefisso Tabelle"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Stringa di connessione"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "Per esempio, '{0}' per SQL Server."
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Ricetta"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Disabilita Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Modifica Tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Abilita Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Abilita un tenant."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr "Il nome del profilo delle funzionalità."
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr "Non valido"
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Aspetto"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Imposta Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Seleziona il nome del tenant da inizializzare."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Nome Sito"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Nome utente admin"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Email dell'amministratore"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Password amministratore"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Che tipo di database utilizzare?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Prefisso Tabelle"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Stringa di connessione"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "Per esempio, '{0}' per SQL Server."
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/it/OrchardCore.Tests.po b/Localization/it/OrchardCore.Tests.po
index c2ed3e1a56e47..e6e77ab450f4b 100644
--- a/Localization/it/OrchardCore.Tests.po
+++ b/Localization/it/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-21 06:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr "Aggiungi Task"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr "Test"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr "Attività scrivi una riga"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr "Test"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr "Fatto"
diff --git a/Localization/it/OrchardCore.Themes.po b/Localization/it/OrchardCore.Themes.po
index 813db94e58006..b97987633049c 100644
--- a/Localization/it/OrchardCore.Themes.po
+++ b/Localization/it/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Esporta i temi front-end e i temi back-end del sito attualmente selezionati."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/it/OrchardCore.Title.po b/Localization/it/OrchardCore.Title.po
index e365edba27346..17c0d9e6cec3b 100644
--- a/Localization/it/OrchardCore.Title.po
+++ b/Localization/it/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "È richiesto un valore per il Titolo."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr "È richiesto un valore per il Titolo."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Il modello non contiene un'espressione Liquid valida. Dettagli: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Il titolo sarà generato automaticamente usando il modello."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Spunta la casella per visualizzare il titolo nelle viste."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/it/OrchardCore.Twitter.po b/Localization/it/OrchardCore.Twitter.po
index 475968232459d..502f1056a386c 100644
--- a/Localization/it/OrchardCore.Twitter.po
+++ b/Localization/it/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "La chiave segreta del token di accesso è obbligatoria"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Task aggiorna stato Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Social"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Fallito"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr "Twitter"
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Il tenant verrà riavviato quando le impostazioni saranno salvate."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Vedi la documentazione"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "Si è verificato un errore durante la decifratura di un'impostazione. Si prega di applicare e salvare."
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Impostazioni integrazione Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Chiave API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "La chiave API definita nelle chiavi e nelle schede token della dashboard dell'app twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Chiave segreta API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "La API Secret Key definita nelle chiavi e nelle schede token della dashboard dell'app twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Access Token"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "L' Access Token definito nelle chiavi e nelle schede token della dashboard dell'app twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Access Token Secret"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "L' Access Token Secret definito nelle chiavi e nelle schede token della dashboard dell'app twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Accedi con le impostazioni di Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Aggiorna Stato Twitter"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/it/OrchardCore.Users.Core.po b/Localization/it/OrchardCore.Users.Core.po
index aab2dfc08bb4c..c0ed43f4a08ea 100644
--- a/Localization/it/OrchardCore.Users.Core.po
+++ b/Localization/it/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Email '{0}' non valida."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Errore imprevisto: '{0}'."
diff --git a/Localization/it/OrchardCore.Users.po b/Localization/it/OrchardCore.Users.po
index 07ef44d52f054..1c4ad6d404ec1 100644
--- a/Localization/it/OrchardCore.Users.po
+++ b/Localization/it/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Utente creato correttamente"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Login locale disabilitata."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "L'account è bloccato"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Tentativo di accesso non valido."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "La password è stata modificata correttamente."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Si è verificato un errore nel provider esterno."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Il sito non consente la registrazione utente."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Conferma il tuo account"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "L'utente specificato non è autorizzato ad accedere."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Devi prima confermare la tua email."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Tutti gli utenti"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Abilita utenti"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Diabilita utenti"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nome"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Approva"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Abilita"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Disabilita"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Elimina"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Tutti i ruoli"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Autenticato (nessun ruolo)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Utente {0} approvato con successo."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Utente {0} eliminato con successo."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Utente {0} disabilitato con successo."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Utente {0} abilitato con successo."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Utente creato correttamente."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Utente aggiornato correttamente."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Utente eliminato con successo."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Impossibile eliminare l'utente."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Password aggiornata correttamente."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Utente sbloccato correttamente."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Impossibile sbloccare l'utente."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "Impossibile aggiornare i propri ruoli."
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Impostazioni Login"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Esporta le impostazioni di login."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Impostazioni di Modifica Email"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Esporta le impostazioni di modifica della email."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Impostazioni di registrazione"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Esporta le impostazioni di registrazione."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Importazioni di reset password"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Esporta le impostazioni di reset password."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "La nuova password e la password di conferma non corrispondono."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Task Assegna Ruolo Utente"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Utente"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Operazione non riuscita"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Task Registrazione Utente"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Utente"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Valido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Non valido"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Nessun servizio email disponibile"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Evento di aggiornamento utente"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Utente"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Task per la validazione utente"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonimo"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Autenticato"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Nel ruolo "
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "È richiesto un valore per {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} al ruolo {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "L'utente da assegnare. Con supporto Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Modifica la password"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Password attuale"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nuova password"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Crea utente"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Modifica password"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nuova password"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Per favore controlla la tua email per reimpostare la password."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Modifica E-mail"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Hai effettuato correttamente l'autenticazione con <strong>{0}</strong>. Hai già un account con questo indirizzo email. Inserisci la password del tuo account locale e clicca su Registra per collegare gli account e completare l'accesso."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Nome utente"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Accedi"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Usa un altro servizio per accedere"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Accedi con {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Crea un nuovo account."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Nome utente"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Password"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Hai effettuato correttamente l'autenticazione con <strong>{0}</strong>. Si prega di compilare il form qui sotto e fare clic sul pulsante Registrati per completare la registrazione."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Nome utente"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Password"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Invia email di conferma"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Oggetto del messaggio. Supporta la sintassi Liquid."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Home"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Reimposta password"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "Email"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nuova password"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "L'utente è disabilitato."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "L'utente è abilitato."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Deseleziona per disabilitare questo account utente."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr "Nome utente"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Imposta la proprietà del flusso di lavoro 'UserName' se l'utente è autenticato"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Ruoli"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Il risultato di 'Nel ruolo ' verrà attivato se l'utente ha almeno uno dei ruoli selezionati."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/it/OrchardCore.Widgets.po b/Localization/it/OrchardCore.Widgets.po
index c0f3a5d758299..3938b492f3f42 100644
--- a/Localization/it/OrchardCore.Widgets.po
+++ b/Localization/it/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Aggiungi Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Predefinito"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/it/OrchardCore.Workflows.po b/Localization/it/OrchardCore.Workflows.po
index b6693eb873e24..826c31d673cf7 100644
--- a/Localization/it/OrchardCore.Workflows.po
+++ b/Localization/it/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Attività Commit Transaction"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Sessione"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Valido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Non valido"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Task Correlati"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Task Per Ogni"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Itera"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Task Fork"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Task Ciclo For"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Itera"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Task If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Vero"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Falso"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Task Join"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Unito"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Task Log"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Fatto"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Eccezioni"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Task Notifica"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "UI"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Task Script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Task Set Output"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Task Set Property"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Primitives"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Task Ciclo While"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Controllo del flusso"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Itera"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Fatto"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Attività aggiornata con successo."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Creati di recente"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Creati di recente"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "In Errore"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Finito"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Elimina"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Il workflow {0} è stato eliminato."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Elimina"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Il workflow {0} è stato eliminato."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Il workflow è stato salvato."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Workflow {0} eliminato"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Attività di Redirect Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Fatto"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Evento richiesta HTTP"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Fatto"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Corrispondenti"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Attività di Richiesta Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Stato Http non gestito"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Attività di Risposta Http"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Fatto"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Non autorizzato ad attivare '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Task Avvio"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Modifica"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Aggiungi"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Correlazione"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Indietro"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Sei sicuro di voler eliminare questa istanza di workflow?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Elimina"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "Avanzate"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "La scheda avanzata contiene un valore non valido per il blocco scadenza"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "Il timeout in millisecondi per acquisire un lock prima di eseguire un'attività in maniera atomica. Lascialo a zero per non usare alcun blocco."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Eventi disponibili"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Task disponibile"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Sei sicuro di voler eliminare questa attività?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtra"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Avanzate"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "La scheda avanzata contiene un valore non valido per il blocco scadenza"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "Il timeout in millisecondi per acquisire un lock prima di eseguire un'attività in maniera atomica. Lascialo a zero per non usare alcun blocco."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Itera <em>{0}</em> su <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "L'elenco da iterare. Supporta sintassi JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Nessuna suddivisione"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Itera <em>{0}</em> da <em>{1}</em> a <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Valore iniziale. Supporta sintassi JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Valore finale. Supporta sintassi JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Valore del passo. Supporta sintassi JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "HTTP Redirect"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "L'URL a cui reindirizzare. Supporta sintassi Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Permanente"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Se selezionato, il reindirizzamento deve essere permanente (301). Lasciare deselezionato per un redirect temporaneo (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Gestione della richiesta HTTP in entrata"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Chiunque invochi questo URL attiverà questo workflow. Salva questa informazione in modo sicuro."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Valida Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Deseleziona questa opzione se la richiesta proviene da un servizio che invoca questa URL come webhook. Se questa URL è richiesto da un form, mantieni selezionata questa opzione per garantire che i valori del modulo non siano stati modificati."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Token Life Span"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Clikka il pulsante <b>Rigenera</b> dopo aver cambiato questo valore."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Numero di giorni di scadenza del token. 0 per non far scadere il token"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Filtra richiesta HTTP in arrivo"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Il metodo HTTP da abbinare."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Il nome del controller da abbinare."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Il nome dell'azione da abbinare."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr "<em>{0} {1}</em>"
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "L'URL a cui inviare la richiesta. Supporta la sintassi Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "Il metodo HTTP. Ad esempio: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Il tipo di contenuto nel corpo della richiesta."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Il body da inviare con richieste POST, PUT e PATCH. Supporta sintassi Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Fornisci ulteriori headers HTTP, una per riga. Ad esempio: Authorization: Bearer 123ABC. Supporta sintassi Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "Risposta HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Il codice di stato HTTP da inviare. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Clicca qui</a> per una lista completa."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Il tipo di contenuto nel corpo della risposta."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Il contenuto da ritornare. Supporta sintassi Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Valuta <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Ordina"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Sei sicuro di voler eliminare questa istanza di workflow?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Elimina"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Creato {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Nessun elemento!</strong> Non ci sono workflow fermi per il momento."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Indietro"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "selezionato"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 istanza"
-msgstr[1] "{0} istanze"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "In attesa <strong>qualsiasi</strong> attività in ingresso prima di unire l'esecuzione in un unico percorso."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Log"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Il livello di log."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} Notifica"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Tipo di notifica."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Script"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Un elenco separato da virgole di possibili risultati disponibili."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Output tramite {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Il nome dell'output."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Imposta proprietà {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "La proprietà da impostare. Se la proprietà specificata non esiste ancora, verrà aggiunta."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Quando <em>{0}</em> è attivato"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr "<em>{0}</em>"
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Nessuna azione utente specificata"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Inserisci uno o più nomi di azione separandoli con una virgola."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Ciclo while <em>{0}</em> è vero"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Itera finchè la condizione è vera."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/it/TheAdmin.po b/Localization/it/TheAdmin.po
index a0ba6dbc341ae..b7dd9435d23e1 100644
--- a/Localization/it/TheAdmin.po
+++ b/Localization/it/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Modalità Chiara"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Modalità scura"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Visita il Sito"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Comprimi / espandi menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Elimina"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Sei sicuro di voler rimuovere questo elemento?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Ok"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Annulla"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/it/TheAgencyTheme.po b/Localization/it/TheAgencyTheme.po
index aef009f647d0a..c4bc54a212113 100644
--- a/Localization/it/TheAgencyTheme.po
+++ b/Localization/it/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Non ci sono risultati."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Pagina non trovata"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Non abbiamo trovato la pagina che stai cercando."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/it/TheBlogTheme.po b/Localization/it/TheBlogTheme.po
index 15edb61a07ef7..9df75a432fa23 100644
--- a/Localization/it/TheBlogTheme.po
+++ b/Localization/it/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-02-21 06:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "il {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Non ci sono risultati."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Pagina non trovata"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/it/TheTheme.po b/Localization/it/TheTheme.po
index 2f935dac4d39f..bb730ab133823 100644
--- a/Localization/it/TheTheme.po
+++ b/Localization/it/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Benvenuto in Orchard Core, il tuo sito è stato impostato con successo."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/ja/OrchardCore.Admin.po b/Localization/ja/OrchardCore.Admin.po
index b4af9138c618d..8f98183a32da3 100644
--- a/Localization/ja/OrchardCore.Admin.po
+++ b/Localization/ja/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "管理"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "管理設定"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "管理者設定をエクスポート"
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "自由にメニューを閲覧してすべての可能性を見つけてください。"
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "ダークモードの管理者テーマを有効にする"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "ダークモードの管理者テーマを表示できるかどうか。"
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "タイトルがトップバーに表示されるかどうか。"
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "管理"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/ja/OrchardCore.AdminDashboard.po b/Localization/ja/OrchardCore.AdminDashboard.po
index 3c7c7eff4c2dd..56fff9e9ff59d 100644
--- a/Localization/ja/OrchardCore.AdminDashboard.po
+++ b/Localization/ja/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "いいえ"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "位置"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "幅"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/ja/OrchardCore.AdminMenu.po b/Localization/ja/OrchardCore.AdminMenu.po
index 06b7239d0ff32..61c3903ea9973 100644
--- a/Localization/ja/OrchardCore.AdminMenu.po
+++ b/Localization/ja/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "管理メニュー {0} を作成"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "名前"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "項目の作成"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "管理メニュー {0} の編集"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "名前"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "項目を編集"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "他のリンクの Url が同じ場合にこのリンクの表示を優先。ナビゲーションでは最も高い値のリンクがアクティブステータスとなります"
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "リンクの管理者メニューでの表示順"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "リンク"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "ツリーに表示されるリンクの文字列"
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "リンクの文字列。リンクはそれまたはその子がUrlを持つ場合のみに表示されます。Url は管理メニューのルートからの相対パスとなります"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "アイコンの選択"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "プレースホルダ"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "ツリーに表示されるメニュー項目の文字列"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr "選択"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "このメニュー項目が最初のレベルの場合に表示されるアイコンの選択"
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "アイコンの選択"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/ja/OrchardCore.Alias.po b/Localization/ja/OrchardCore.Alias.po
index 0f779113dca6d..530d2ae45ebaf 100644
--- a/Localization/ja/OrchardCore.Alias.po
+++ b/Localization/ja/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "バターンは正しいリキッド式を含んでいません。詳細: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "空のままにして再作成"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "別名が生成され入力は無効です"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ja/OrchardCore.ArchiveLater.po b/Localization/ja/OrchardCore.ArchiveLater.po
index 7256807e4814e..a1a7b889d55de 100644
--- a/Localization/ja/OrchardCore.ArchiveLater.po
+++ b/Localization/ja/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ja/OrchardCore.AuditTrail.po b/Localization/ja/OrchardCore.AuditTrail.po
index 77198f97a829b..98e5ce64e516c 100644
--- a/Localization/ja/OrchardCore.AuditTrail.po
+++ b/Localization/ja/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/ja/OrchardCore.Autoroute.po b/Localization/ja/OrchardCore.Autoroute.po
index d6b4821d32cc0..0068f334e395c 100644
--- a/Localization/ja/OrchardCore.Autoroute.po
+++ b/Localization/ja/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "チェックするとこのコンテンツ項目の自動url生成処理を無効にします"
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "チェックすると子のコンテンツ項目が絶対パスにルーティングされることを指定します。"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ja/OrchardCore.BackgroundTasks.po b/Localization/ja/OrchardCore.BackgroundTasks.po
index 3cdac60b87c06..41ba2b399ec6a 100644
--- a/Localization/ja/OrchardCore.BackgroundTasks.po
+++ b/Localization/ja/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/ja/OrchardCore.ContentFields.po b/Localization/ja/OrchardCore.ContentFields.po
index c3b5e8402f14d..4b7a3119bf825 100644
--- a/Localization/ja/OrchardCore.ContentFields.po
+++ b/Localization/ja/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "切り替え"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "エディタでこのフィールドに表示するヒント文字列"
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "コンテンツはありません"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "標準"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "選択"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "削除"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "表示するコンテンツ種別。少なくとも一つを選択します。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "値が必須かどうか"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "エディタのこのフィールドに表示するヒントのテキスト。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg エディタ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "コンテンツはありません"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "標準"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "非公開"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "選択"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "削除"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "範囲"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "なし"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "値が必須かどうか"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "小数点以下の桁数。"
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "許可される最小の値 (オプション)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "許可される最大の値 (オプション)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "必須"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "ヒント"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "幅"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "ビデオの幅"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "高さ"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "ビデオの高さ"
diff --git a/Localization/ja/OrchardCore.ContentLocalization.po b/Localization/ja/OrchardCore.ContentLocalization.po
index d34fbb8850698..9e14b6875aff7 100644
--- a/Localization/ja/OrchardCore.ContentLocalization.po
+++ b/Localization/ja/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/ja/OrchardCore.ContentPreview.po b/Localization/ja/OrchardCore.ContentPreview.po
index 7d3720724fccd..02288a6adc56a 100644
--- a/Localization/ja/OrchardCore.ContentPreview.po
+++ b/Localization/ja/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "バターンは有効なリキッド式を含んでいません。詳細: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "プレビュー"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "プレビューが切断されました"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "プレビューエラー"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ja/OrchardCore.ContentTypes.po b/Localization/ja/OrchardCore.ContentTypes.po
index 61706b9f75629..7f2c8d08af976 100644
--- a/Localization/ja/OrchardCore.ContentTypes.po
+++ b/Localization/ja/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "コンテンツのパーツ"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "表示名は空にできません"
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "同じ表示名の型がすでに存在します"
@@ -66,10 +66,10 @@ msgstr "同じ表示名の型がすでに存在します"
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "技術名は空にできません"
@@ -78,10 +78,10 @@ msgstr "技術名は空にできません"
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "技術名はアルファベットの文字から始まる必要があります"
@@ -90,10 +90,10 @@ msgstr "技術名はアルファベットの文字から始まる必要があり
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "技術名は無効な文字を含んでいます"
@@ -101,133 +101,133 @@ msgstr "技術名は無効な文字を含んでいます"
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "同一の技術名の型がすでに存在します"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "コンテンツ種別「{0}」が作成されました"
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\" の設定が保存されました"
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" は削除されました"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "\"{0}\" パートが追加されました"
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "同じ表示名を持つパーツが既に存在します。"
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "同じ技術名を持つパーツが既に存在します。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "\"{0}\" パートが削除されました"
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "コンテンツのパーツを作成できませんでした。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "コンテンツのパーツ \"{0}\" が作成されました。"
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "\"{0}\" の設定が保存されました。"
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "同じ表示名のフィールドが既に存在します。"
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "同じ技術名のフィールドが既に存在します。"
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "フィールド \"{0}\" が追加されました。"
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "表示名が {0} に変更されました。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "\"{0}\" フィールドの設定が保存されました。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "\"{0}\" フィールドが削除されました。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "\"{0}\" パーツ設定が保存されました。"
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "コンテンツの種類名は空にできません。"
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "'{0}' という名前のパーツを追加することはできません。既に存在します。"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "新しいフィールドを \"{0}\" に追加"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "画面に表示されるフィールド名です。"
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "名前付きパーツを \"{0}\" に追加"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "画面に表示される再利用可能なパーツの名前です。"
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "再利用可能なパーツの技術名。"
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "画面に表示されるパーツ名です。空白の場合はデフォルトを使用します。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "このパーツを複数回追加できるようにする場合はチェック"
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "画面に表示される種類の名前です。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "新規コンテンツ種別"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "画面に表示される種類の名前です。"
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "新規コンテンツパート"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "作成"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "コンテンツの種類- {0} を編集"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "フィールド"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "編集"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "削除"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "フィールドを追加"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "パーツ"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "パーツを追加"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "名前付きパーツを追加"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "保存"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "削除"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{1}\"のための \"{0}\" 設定"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "画面に表示されるフィールド名です。"
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "フィールドの技術名。"
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "どの種類のエディタを使用する必要がありますか?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "どの種類の表示モードを使用する必要がありますか?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "保存"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "キャンセル"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "すべての種類に共通するパーツ設定。設定は <a href=\"{0}\">パーツ定義</a> レベルでも定義できます。"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "画面に表示されるパーツ名です。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "画面に表示されるパーツ名です。"
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "どの種類のエディタを使用する必要がありますか?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "どの種類の表示モードを使用しますか?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "保存"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "キャンセル"
diff --git a/Localization/ja/OrchardCore.Contents.po b/Localization/ja/OrchardCore.Contents.po
index 6484bfc888189..b36067f284cee 100644
--- a/Localization/ja/OrchardCore.Contents.po
+++ b/Localization/ja/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} は非公開になりました"
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "すべてのコンテンツタイプ"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "コンテンツ"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "完了"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "そして続行"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "操作"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "コンテンツ"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "コンテンツの項目"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "すべてのコンテンツ種別を表示"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "アイコンの選択"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "すべてのコンテンツ種別を表示"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "全て"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "すべてのコンテンツ種別"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "コンテンツの作成"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "下書きをJSON形式で表示"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "下書きをJSON形式でダウンロード"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "公開済みをJSON形式で表示"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "公開済をJSON形式でダウンロード"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "JSON形式で表示"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "コンテンツ"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "新規"
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/ja/OrchardCore.CustomSettings.po b/Localization/ja/OrchardCore.CustomSettings.po
index c7abcc9304820..604ea548858e9 100644
--- a/Localization/ja/OrchardCore.CustomSettings.po
+++ b/Localization/ja/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "カスタム設定"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "全て"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/ja/OrchardCore.Data.YesSql.po b/Localization/ja/OrchardCore.Data.YesSql.po
index 754cb835dcd7b..3ac8f4ddcc92e 100644
--- a/Localization/ja/OrchardCore.Data.YesSql.po
+++ b/Localization/ja/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/ja/OrchardCore.Demo.po b/Localization/ja/OrchardCore.Demo.po
index d91f1756f5655..33d0befb481b0 100644
--- a/Localization/ja/OrchardCore.Demo.po
+++ b/Localization/ja/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "名"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "姓"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/ja/OrchardCore.Deployment.Remote.po b/Localization/ja/OrchardCore.Deployment.Remote.po
index 403f90be2de33..7dc14c182270d 100644
--- a/Localization/ja/OrchardCore.Deployment.Remote.po
+++ b/Localization/ja/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "クライアント名"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/ja/OrchardCore.Deployment.po b/Localization/ja/OrchardCore.Deployment.po
index 5cd9367c51a6e..19958f3839d70 100644
--- a/Localization/ja/OrchardCore.Deployment.po
+++ b/Localization/ja/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON インポート"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "削除"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "名前は必須です"
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "同じ名前の配置プランがすでに存在します。"
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "配置プランを作成"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "このプランの一部として追加するカスタムファイル"
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "アーカイブに追加されるファイル名。"
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "配置プラン"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "全て"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "配置プランの編集"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "このプランの一部として追加するレシピファイル"
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "レシピ名"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "レシピの表示名"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "レシピの説明。"
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "レシピの作成者。"
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "レシピのウェブサイト。"
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "レシピのバージョン"
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "レシピのカテゴリ (カンマ区切りの値)。"
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/ja/OrchardCore.Diagnostics.po b/Localization/ja/OrchardCore.Diagnostics.po
index 864c00321d3d1..fd51a4310f5bc 100644
--- a/Localization/ja/OrchardCore.Diagnostics.po
+++ b/Localization/ja/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "お使いのブラウザは、このサーバーが理解できないリクエストを送信しました。"
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "リクエストの実行中にエラーが発生しました"
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "リソースへのアクセス権がありません"
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "ページが見つかりません。"
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "このコンテンツの閲覧権限がありません"
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/ja/OrchardCore.Email.Abstractions.po b/Localization/ja/OrchardCore.Email.Abstractions.po
index 131375b41f11e..f89e6721ad9f3 100644
--- a/Localization/ja/OrchardCore.Email.Abstractions.po
+++ b/Localization/ja/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "{0} フィールドは必須です"
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "配送方法「 {0} 」はサポートされていません"
diff --git a/Localization/ja/OrchardCore.Email.po b/Localization/ja/OrchardCore.Email.po
index 9c4e4e2ca2cb9..20d25ef8fe455 100644
--- a/Localization/ja/OrchardCore.Email.po
+++ b/Localization/ja/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "メールタスク"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "メッセージング"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "完了しました"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "失敗しました"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "メール送付"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "受信者のメールアドレスのカンマ区切りリスト。Liquid 式を利用可能。"
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "設定"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "宛先"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "送信者はオプションです。メール作成者とメール送信者が異なる場合に便利です。"
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "返信先"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "件名"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "本文"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "現在のテナントは設定が保存された時に再読み込みされます"
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "ネットワーク配送オプション"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "SMTPサーバーのドメイン。例、 <i>smtp.mailprovider.com</i>。"
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "SMTPサーバのポート、普通は 25"
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "認証用のユーザー名"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "例: <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> は C ドライブの <i>PickedEmail</i> ディレクトリにメールを配置します。"
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/ja/OrchardCore.Facebook.po b/Localization/ja/OrchardCore.Facebook.po
index 099e7929b1b13..afe0b88076a48 100644
--- a/Localization/ja/OrchardCore.Facebook.po
+++ b/Localization/ja/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "FaceBook 本文には有効な Liquid 表現が含まれていません。詳細: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "本文に有効な Liquid 式が含まれていません。詳細: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "ログイン設定"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "プラグインのテンプレート。Liquid形式で指定します。"
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Javascript SDK バージョン"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/ja/OrchardCore.Features.po b/Localization/ja/OrchardCore.Features.po
index c9638602554c5..f0102f9afcb5f 100644
--- a/Localization/ja/OrchardCore.Features.po
+++ b/Localization/ja/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "機能"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "一つ以上の機能を選択してください"
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "一括操作"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "無効化"
@@ -136,8 +136,8 @@ msgstr "無効化"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "有効化"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "未分類"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "機能 {0} を無効にすると依存する次の機能も無効になります:{1} 続けますか？"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "機能を無効にする"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "はい"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "いいえ"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>ここには何もありません!</strong> 検索結果はありません。"
diff --git a/Localization/ja/OrchardCore.Flows.po b/Localization/ja/OrchardCore.Flows.po
index 5d4367d946c23..f5caa96003b80 100644
--- a/Localization/ja/OrchardCore.Flows.po
+++ b/Localization/ja/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "項目を追加"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "ウィジェット挿入"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "削除"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "この項目を削除しますか？"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/ja/OrchardCore.Forms.po b/Localization/ja/OrchardCore.Forms.po
index 9c2ed663d1edb..d552babcf91c5 100644
--- a/Localization/ja/OrchardCore.Forms.po
+++ b/Localization/ja/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "モデル検証エラータスクを追加"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "検証"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "検証"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "検証"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "有効"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "入力値が不正です"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "検証"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "有効"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "入力値が不正です"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "検証"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "有効"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "入力値が不正です"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "無効な値を持つフォームフィールドの名前。"
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "ボタンに表示するテキスト"
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "ボタンの種類"
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "ボタンの種類"
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "フィールドの初期値"
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/ja/OrchardCore.GitHub.po b/Localization/ja/OrchardCore.GitHub.po
index ef94ecb7090f5..388f11fd47487 100644
--- a/Localization/ja/OrchardCore.GitHub.po
+++ b/Localization/ja/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "GitHub 認証設定"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "<a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub アプリ</a> の一般タブで定義されているクライアント ID 。"
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "アプリのシークレット。"
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ja/OrchardCore.Google.po b/Localization/ja/OrchardCore.Google.po
index cccf4065255c3..0f1c623aea865 100644
--- a/Localization/ja/OrchardCore.Google.po
+++ b/Localization/ja/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Googleアナリティクスの設定"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/ja/OrchardCore.Html.po b/Localization/ja/OrchardCore.Html.po
index 5076124eaa20f..5c36de8e238fd 100644
--- a/Localization/ja/OrchardCore.Html.po
+++ b/Localization/ja/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "HTMLエディタ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "コンテンツの項目の本文"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "エディタのオプションを入力してください"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "オプションのドキュメント"
diff --git a/Localization/ja/OrchardCore.Https.po b/Localization/ja/OrchardCore.Https.po
index 9fb9ebf498373..5ad46879822ff 100644
--- a/Localization/ja/OrchardCore.Https.po
+++ b/Localization/ja/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/ja/OrchardCore.Infrastructure.Abstractions.po b/Localization/ja/OrchardCore.Infrastructure.Abstractions.po
index 21831c128c312..dcb2c80a021bc 100644
--- a/Localization/ja/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/ja/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/ja/OrchardCore.Layers.po b/Localization/ja/OrchardCore.Layers.po
index 21c8b47396d11..0cc3c1509b502 100644
--- a/Localization/ja/OrchardCore.Layers.po
+++ b/Localization/ja/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "レイヤの作成"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "説明"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "レイヤ - {0} の編集"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "ウィジェットとレイヤを編集"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "ウィジェットを正常に移動しました。 <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>元に戻す</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "ゾーン"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "ウィジェットを追加する前に、 <a href=\"{0}\">利用可能なゾーンを定義してください</a>"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "ウィジェットの追加"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "レイヤ"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "関連するウィジェットを表示するレイヤを選択します。"
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "編集"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "削除"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "ウィジェットを追加する前に <a href=\"{0}\">レイヤを作成</a> してください"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "追加"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "チェックされている場合、タイトルはウィジェットで表示されます。"
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "ウィジェットを関連付けるレイヤ。"
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/ja/OrchardCore.Liquid.po b/Localization/ja/OrchardCore.Liquid.po
index f1d5a8298f9e2..86f4d8e53e4cc 100644
--- a/Localization/ja/OrchardCore.Liquid.po
+++ b/Localization/ja/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/ja/OrchardCore.Lists.po b/Localization/ja/OrchardCore.Lists.po
index 9f394c08776da..1d96651fdc7e5 100644
--- a/Localization/ja/OrchardCore.Lists.po
+++ b/Localization/ja/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "このコンテンツを削除する権限がありません。"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "ユーザー名またはメールアドレスまたはパスワードが正しくありません。"
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "リストは空です"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "手動の並び替えを有効にするには、このオプションをチェックしてください。"
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "リスト"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "親メニュー項目を追加"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/ja/OrchardCore.Localization.po b/Localization/ja/OrchardCore.Localization.po
index 68c1a57a5f9e4..31b1538289486 100644
--- a/Localization/ja/OrchardCore.Localization.po
+++ b/Localization/ja/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "カルチャ"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "カルチャは必須です"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "サイトに設定された現在のカルチャ"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "カルチャの追加"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/ja/OrchardCore.Markdown.po b/Localization/ja/OrchardCore.Markdown.po
index 6fff8a72a2e81..f1bad253d528d 100644
--- a/Localization/ja/OrchardCore.Markdown.po
+++ b/Localization/ja/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg エディタ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg エディタ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ja/OrchardCore.Media.po b/Localization/ja/OrchardCore.Media.po
index a304c1e6d449f..f90b1a442d54f 100644
--- a/Localization/ja/OrchardCore.Media.po
+++ b/Localization/ja/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "同名のファイルが存在するためメディアを移動できません"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "ファイル操作でエラーが発生しました:{0}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "アセットをトップディレクトリのみから取得するか、それともすべてのサブディレクトリからも同様に取得するかどうか。"
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "選択を反転"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "フォルダーを作成"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "項目の名前を変更"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "メディア"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "全て"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,43 +1083,43 @@ msgid "Exports all or specified media."
 msgstr "すべてまたは特定のメディアをエクスポート"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " 小さいサムネイル"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " 大きいサムネイル"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "添付ファイル"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " 小さいサムネイル"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " 大きいサムネイル"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "メディアの選択"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ja/OrchardCore.Menu.po b/Localization/ja/OrchardCore.Menu.po
index da7f7aa28bac0..be97dac2b4f73 100644
--- a/Localization/ja/OrchardCore.Menu.po
+++ b/Localization/ja/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "メニュー"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "{0} を編集"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/ja/OrchardCore.Microsoft.Authentication.po b/Localization/ja/OrchardCore.Microsoft.Authentication.po
index 409ff8c016a3c..861188f11466c 100644
--- a/Localization/ja/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/ja/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ja/OrchardCore.Navigation.po b/Localization/ja/OrchardCore.Navigation.po
index a8b5d6a4097b6..5c5a8589ab84b 100644
--- a/Localization/ja/OrchardCore.Navigation.po
+++ b/Localization/ja/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/ja/OrchardCore.Notifications.po b/Localization/ja/OrchardCore.Notifications.po
index 0c68efb23d378..ad3da8b86e186 100644
--- a/Localization/ja/OrchardCore.Notifications.po
+++ b/Localization/ja/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,10 +375,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/ja/OrchardCore.OpenId.po b/Localization/ja/OrchardCore.OpenId.po
index 191afa15e40a0..652cf4b8389b5 100644
--- a/Localization/ja/OrchardCore.OpenId.po
+++ b/Localization/ja/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/ja/OrchardCore.Placements.po b/Localization/ja/OrchardCore.Placements.po
index 94061011977aa..392614ec676e5 100644
--- a/Localization/ja/OrchardCore.Placements.po
+++ b/Localization/ja/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/ja/OrchardCore.ProjectTemplates.po b/Localization/ja/OrchardCore.ProjectTemplates.po
index 35bf722a61002..c45ffc761e78e 100644
--- a/Localization/ja/OrchardCore.ProjectTemplates.po
+++ b/Localization/ja/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "表示"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ja/OrchardCore.PublishLater.po b/Localization/ja/OrchardCore.PublishLater.po
index 1296fcffb2edd..9919756705e6a 100644
--- a/Localization/ja/OrchardCore.PublishLater.po
+++ b/Localization/ja/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "後で公開"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "後で公開をキャンセル"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ja/OrchardCore.Queries.po b/Localization/ja/OrchardCore.Queries.po
index 29866684a4b26..34aab76d57d13 100644
--- a/Localization/ja/OrchardCore.Queries.po
+++ b/Localization/ja/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "SQL クエリを実行します。"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQLクエリ"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/ja/OrchardCore.ReCaptcha.Core.po b/Localization/ja/OrchardCore.ReCaptcha.Core.po
index 816ed100d9625..584fb8ff625cf 100644
--- a/Localization/ja/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/ja/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "キャプチャの認証に失敗しました"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "キャプチャの認証に失敗しました"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "名前 {0} の言語が見つかりません"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/ja/OrchardCore.ReCaptcha.po b/Localization/ja/OrchardCore.ReCaptcha.po
index c1a56f3b3dce4..c93c967066fa3 100644
--- a/Localization/ja/OrchardCore.ReCaptcha.po
+++ b/Localization/ja/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "ReCaptcha 設定をエクスポートします。"
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "ReCaptcha タスクを検証"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "検証"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "有効"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "無効"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "キャプチャ認証に失敗しました。再試行してください。"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "現在のテナントは設定が保存されるときに再読み込みされます。"
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "GoogleアカウントのreCaptchaサイトキー。"
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/ja/OrchardCore.Recipes.Core.po b/Localization/ja/OrchardCore.Recipes.Core.po
index 93dcea23d81ac..3b66bec68e983 100644
--- a/Localization/ja/OrchardCore.Recipes.Core.po
+++ b/Localization/ja/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/ja/OrchardCore.Roles.po b/Localization/ja/OrchardCore.Roles.po
index 16c664c7334e5..240db8655dd4f 100644
--- a/Localization/ja/OrchardCore.Roles.po
+++ b/Localization/ja/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "ロール"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "無効なロール名です。"
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "ロールは正常に更新されました"
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "システムロールを削除できません。"
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "ロールを作成"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "ロール名称"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "ロールの詳細を編集"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "権限"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "権限はユーザーの他の権限を昇格させる可能性があります。よく考慮して権限を付与してください。"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "キャンセル"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "ロール"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/ja/OrchardCore.Rules.po b/Localization/ja/OrchardCore.Rules.po
index ca2baecb9f975..79b4acd2be1f4 100644
--- a/Localization/ja/OrchardCore.Rules.po
+++ b/Localization/ja/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/ja/OrchardCore.Search.Elasticsearch.po b/Localization/ja/OrchardCore.Search.Elasticsearch.po
index 932afc7d21617..9722c61fe8c0d 100644
--- a/Localization/ja/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/ja/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/ja/OrchardCore.Search.Lucene.po b/Localization/ja/OrchardCore.Search.Lucene.po
index d3ef67e506474..7475330802dd6 100644
--- a/Localization/ja/OrchardCore.Search.Lucene.po
+++ b/Localization/ja/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/ja/OrchardCore.Search.po b/Localization/ja/OrchardCore.Search.po
index 1e5bc04e9980c..f73cd9ffd3c5d 100644
--- a/Localization/ja/OrchardCore.Search.po
+++ b/Localization/ja/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/ja/OrchardCore.Security.po b/Localization/ja/OrchardCore.Security.po
index b3aefa15be680..abb986b7d1ca6 100644
--- a/Localization/ja/OrchardCore.Security.po
+++ b/Localization/ja/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/ja/OrchardCore.Seo.po b/Localization/ja/OrchardCore.Seo.po
index 9b79c588fe286..4acb4877116cd 100644
--- a/Localization/ja/OrchardCore.Seo.po
+++ b/Localization/ja/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/ja/OrchardCore.Settings.po b/Localization/ja/OrchardCore.Settings.po
index 4671b8134839f..dbb9d600609f6 100644
--- a/Localization/ja/OrchardCore.Settings.po
+++ b/Localization/ja/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "サイト設定の更新に成功しました"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "ベース URL は完全修飾された URL でなければなりません。"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "サイト設定"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/ja/OrchardCore.Setup.Core.po b/Localization/ja/OrchardCore.Setup.Core.po
index 0c51a217b06c0..911acb3a4406b 100644
--- a/Localization/ja/OrchardCore.Setup.Core.po
+++ b/Localization/ja/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/ja/OrchardCore.Setup.po b/Localization/ja/OrchardCore.Setup.po
index 96e36ef381759..9c1fd709d110f 100644
--- a/Localization/ja/OrchardCore.Setup.po
+++ b/Localization/ja/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "パスワードは最低 {0} 文字必要です"
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "レシピなしでセットアップを行うことはできません"
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "これはページのデフォルトのタイトルとなります"
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "レシピを使用すると追加として事前に構成されたオプション、機能、設定をそのまま使用してサイトをセットアップできます。"
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "日付と時刻を表示・編集する際に使用するデフォルトのタイムゾーンを決定します"
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "データベースはサイトの構成と内容を保存するために使用されます"
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "同じデータベースを複数のサイトで再利用する場合は、テーブルプレフィックスを指定できます。"
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "接続文字列を表示/非表示"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "スーパーユーザーは全ての権限があります。スーパーユーザーはセットアップまたは障害からの回復時にのみ使用されます。"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "ユーザー名"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "メールアドレスは必須です"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "パスワードの長さ"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/ja/OrchardCore.Shortcodes.po b/Localization/ja/OrchardCore.Shortcodes.po
index e23e3bcc280da..bee900458ad45 100644
--- a/Localization/ja/OrchardCore.Shortcodes.po
+++ b/Localization/ja/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/ja/OrchardCore.Sitemaps.po b/Localization/ja/OrchardCore.Sitemaps.po
index cd3c0b87d7dde..cc84eb2fa1772 100644
--- a/Localization/ja/OrchardCore.Sitemaps.po
+++ b/Localization/ja/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "名前"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/ja/OrchardCore.Sms.po b/Localization/ja/OrchardCore.Sms.po
index 12e6667227b14..e3627c0a4acc5 100644
--- a/Localization/ja/OrchardCore.Sms.po
+++ b/Localization/ja/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/ja/OrchardCore.Spatial.po b/Localization/ja/OrchardCore.Spatial.po
index 80ecee41e83cf..b2309050bdb22 100644
--- a/Localization/ja/OrchardCore.Spatial.po
+++ b/Localization/ja/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "地図によるエディタ"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "値が必須かどうか"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ja/OrchardCore.Taxonomies.po b/Localization/ja/OrchardCore.Taxonomies.po
index 3d8cc0cd8d4ac..0e308cc349e92 100644
--- a/Localization/ja/OrchardCore.Taxonomies.po
+++ b/Localization/ja/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "'{0}' には値が必要です"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "分類フィルター"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "タグ"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "分類が見つかりません。このフィールドの設定を確認してください。"
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "タグ作成中にエラーが発生しました"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "入力して検索"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "選択"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "削除"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Enter キーを押してタグを作成"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "タグが見つかりません"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "タグ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "分類が見つかりません。このフィールドの設定を確認してください"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "エディタでこのフィールドに表示するヒント文字列"
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "分類"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "必須"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "少なくとも一つの要素が選択されているかどうか"
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "ユニーク"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "一つの要素のみ選択可能かどうか"
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "末端の選択のみ"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "末端の項目のみ選択できるかとうか"
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "用語のコンテンツ種別"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "{0} を追加"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "分類の並び順を変更しました"
diff --git a/Localization/ja/OrchardCore.Templates.Cms.Module.po b/Localization/ja/OrchardCore.Templates.Cms.Module.po
index 8bf4a40bd1506..d2fd67799c008 100644
--- a/Localization/ja/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/ja/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "表示"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ja/OrchardCore.Templates.po b/Localization/ja/OrchardCore.Templates.po
index 2d5a655c4ff9f..e779f3eb734f5 100644
--- a/Localization/ja/OrchardCore.Templates.po
+++ b/Localization/ja/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "\"{0}\" テンプレートが作成されました。"
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "プレビュー"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "テンプレートの名前"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "テンプレートの説明"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "プレビュー"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "テンプレートの名前"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "テンプレートの説明"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/ja/OrchardCore.Tenants.po b/Localization/ja/OrchardCore.Tenants.po
index 4ca32b80345ee..de3f24f9a661c 100644
--- a/Localization/ja/OrchardCore.Tenants.po
+++ b/Localization/ja/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "テナント"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "すべての状態"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "実行中"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "無効"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "未初期化"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "名前"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "状態"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "無効化"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "有効化"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "デフォルトのテナントを無効にすることはできません。"
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "テナント '{0}' は既に無効です。"
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "テナント '{0}' は既に有効です。"
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "無効なテナントのみ有効にできます。"
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "テナントが見つかりません: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "テナントを作成"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "テナントを作成"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "使用するデータベースの種類は?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "テーブルのプレフィックス"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "接続文字列"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "テナントを無効にする"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "テナントを編集"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "テナントを有効にする"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "テナントを有効にする."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "デザイン"
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "テナントをセットアップする"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "セットアップするテナント名を選択します。"
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "サイト名"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "管理者ユーザー名"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "管理者メールアドレス"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "管理者のパスワード"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "使用するデータベースの種類は?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "テーブルのプレフィックス"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "接続文字列"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/ja/OrchardCore.Tests.po b/Localization/ja/OrchardCore.Tests.po
index 72725fbd5c4a0..379bcbdae331f 100644
--- a/Localization/ja/OrchardCore.Tests.po
+++ b/Localization/ja/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/ja/OrchardCore.Themes.po b/Localization/ja/OrchardCore.Themes.po
index 5237a7279943f..cc28a617daa6c 100644
--- a/Localization/ja/OrchardCore.Themes.po
+++ b/Localization/ja/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "現在選択されているサイトのテーマ及び管理サイトのテーマをエクスポートする"
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ja/OrchardCore.Title.po b/Localization/ja/OrchardCore.Title.po
index 03c3cfcf7b6bd..df121411fe267 100644
--- a/Localization/ja/OrchardCore.Title.po
+++ b/Localization/ja/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "タイトルには値が必須です。"
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "パターンに有効なリキッド式が含まれていません。詳細: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "タイトルはパターンを使用して自動生成されます。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "標準"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "表示画面でタイトルを表示するにはチェックします。"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ja/OrchardCore.Twitter.po b/Localization/ja/OrchardCore.Twitter.po
index 9edc913954bff..5c5fb20aa8845 100644
--- a/Localization/ja/OrchardCore.Twitter.po
+++ b/Localization/ja/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/ja/OrchardCore.Users.Core.po b/Localization/ja/OrchardCore.Users.Core.po
index 6bf3bfbfca4f0..7b157e9ac38a4 100644
--- a/Localization/ja/OrchardCore.Users.Core.po
+++ b/Localization/ja/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:22\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "メールアドレス {0} は無効です"
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "想定外のエラー: '{0}'"
diff --git a/Localization/ja/OrchardCore.Users.po b/Localization/ja/OrchardCore.Users.po
index b5e137dd5a949..6bcb29cd04bae 100644
--- a/Localization/ja/OrchardCore.Users.po
+++ b/Localization/ja/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "ユーザーは正常に作成されました"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "ローカルログインは無効です"
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "アカウントはロックされています。"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "ログインは失敗しました"
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "パスワードは正常に変更されました。"
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "外部プロバイダでエラーが発生しました。"
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "このサイトではユーザーの登録はできません"
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "アカウントを確認してください"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "入力されたユーザーはログインが許可されていません"
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "メールを確認してください"
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "すべてのユーザー"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "有効なユーザー"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "無効なユーザー"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "名前"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "メールアドレス"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "承認"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "有効化"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "無効化"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "削除"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "すべてのロール"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "認証済み (ロールなし)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "ユーザー {0} が承認されました。"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "ユーザー {0} が削除されました。"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "ユーザー {0} は無効になりました。"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "ユーザー {0} は有効になりました。"
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "ユーザーは正常に作成されました。"
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "ユーザーは正常に更新されました。"
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "ユーザーは正常に削除されました。"
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "ユーザーは削除できませんでした。"
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "パスワードは正常に更新されました"
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "ユーザーは正常にロック解除されました。"
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "ユーザーはロック解除できませんでした。"
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "ログイン設定"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "ログイン設定をエクスポート"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "メール設定の変更"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "メール設定をエクスポート"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "登録設定"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "登録設定をエクスポート"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "パスワードの設定をリセット"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "パスワードのリセット設定をエクスポート"
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "新規パスワードと確認のパスワードが一致しません"
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "ユーザのロールの割り当てタスク"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "ユーザー"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "失敗しました"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "ユーザー登録タスク"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "ユーザー"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "実行しました"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "有効"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "無効"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "利用可能なメールサービスがありません"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "ユーザー更新後イベント"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "ユーザー"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "ユーザー検証タスク"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "匿名ユーザ"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "認証済み"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} にロール {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "割り当てるユーザー。リキッド式を使用可能です。"
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "新規パスワード"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "ユーザーの作成"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "パスワードを編集"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "新規パスワード"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "メールアドレスの変更"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "ユーザー名"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "メールアドレス"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "ログイン"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "新規アカウントの作成"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "ユーザー名"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "メールアドレス"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "パスワード"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "<strong>{0}</strong>で正常に認証されました。以下のフォームに記入し、登録ボタンをクリックして登録を完了してください。"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "ユーザー名"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "メールアドレス"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "パスワード"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "確認のメールを送信"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "メッセージの件名。リキッド式を使用可能です。"
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "パスワードのリセット"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "メールアドレス"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "新規パスワード"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "ユーザーが無効になった時"
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "ユーザーが有効になった時"
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "このユーザーアカウントを無効にするにはチェックを外してください。"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3416,7 +3488,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3440,16 +3512,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "ロール"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/ja/OrchardCore.Widgets.po b/Localization/ja/OrchardCore.Widgets.po
index 28973971794f1..90fd8c94cb442 100644
--- a/Localization/ja/OrchardCore.Widgets.po
+++ b/Localization/ja/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "ウィジェットの追加"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/ja/OrchardCore.Workflows.po b/Localization/ja/OrchardCore.Workflows.po
index 0c274439fad4a..99db5f63ecfd6 100644
--- a/Localization/ja/OrchardCore.Workflows.po
+++ b/Localization/ja/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "トランザクションのコミットタスク"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "完了"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "完了"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "完了"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "完了"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "完了"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "完了"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "完了"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "完了"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "完了"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1704,40 +1768,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1834,12 +1912,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1873,7 +1950,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1903,7 +1980,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1915,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1963,7 +2040,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1975,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2005,7 +2082,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2017,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2047,7 +2124,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2059,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2089,7 +2166,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2101,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2137,7 +2214,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2173,7 +2250,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2227,7 +2304,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2239,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2275,7 +2352,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2299,3 +2376,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/ja/TheAdmin.po b/Localization/ja/TheAdmin.po
index 9de143e0bd92e..9d2e90ab226f4 100644
--- a/Localization/ja/TheAdmin.po
+++ b/Localization/ja/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "ライトモード"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "ダークモード"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "サイトへ行く"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "メニューを閉じる/広げる"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "削除"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "この項目を削除してよろしいですか"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "はい"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "キャンセル"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ja/TheAgencyTheme.po b/Localization/ja/TheAgencyTheme.po
index c16951a8aaa83..7662276f679c9 100644
--- a/Localization/ja/TheAgencyTheme.po
+++ b/Localization/ja/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "検索結果がありません"
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "ページが見つかりません"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "要求されたページは見つかりませんでした"
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ja/TheBlogTheme.po b/Localization/ja/TheBlogTheme.po
index 78a27fde20262..6be6b9d8f543b 100644
--- a/Localization/ja/TheBlogTheme.po
+++ b/Localization/ja/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-02-18 20:28\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "{0} に"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "検索結果がありません"
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "ページが見つかりません"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ja/TheTheme.po b/Localization/ja/TheTheme.po
index 72d471a5196e7..df886a509e083 100644
--- a/Localization/ja/TheTheme.po
+++ b/Localization/ja/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/ko/OrchardCore.Admin.po b/Localization/ko/OrchardCore.Admin.po
index dd6f1f365adc8..2bd7319a31151 100644
--- a/Localization/ko/OrchardCore.Admin.po
+++ b/Localization/ko/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "관리자"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "관리자 설정"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "관리자 설정 내보내기"
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Orchard에 오신 걸 환영합니다"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "메뉴를 자유롭게 탐색하고 모든 기능들을 발견해 보십시오."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "어두운 모드 관리자 테마 실행하기"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "어두운 모드 관리 테마를 표시할 수 있는지 여부"
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "상단 표시줄에 제목이 표시되는지 여부"
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "관리자"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/ko/OrchardCore.AdminDashboard.po b/Localization/ko/OrchardCore.AdminDashboard.po
index 535b3fbc4e66c..16c29e91e8204 100644
--- a/Localization/ko/OrchardCore.AdminDashboard.po
+++ b/Localization/ko/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "아니오"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "위치"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "너비"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/ko/OrchardCore.AdminMenu.po b/Localization/ko/OrchardCore.AdminMenu.po
index c2342ca8237ef..e117990c6caf8 100644
--- a/Localization/ko/OrchardCore.AdminMenu.po
+++ b/Localization/ko/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "{0} 관리자 메뉴 생성"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "이름"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "노드 생성"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "{0} 관리자 메뉴 수정"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "이름"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "노드 수정"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "두 링크가 동일한 URL을 가리키는 경우 다른 링크 보다 먼저 활성화 되는 우선 순위입니다. 우선순위가 높은 링크가 탐색에서 활성화 됩니다."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "관리자 메뉴에서 링크의 순서"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "링크"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "트리에 표시 될 링크 텍스트"
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "링크의 URL입니다. 링크는 자신이나 하위 링크 중 하나에 URL이있는 경우에만 표시됩니다. URL은 관리 사이트의 루트와의 관계를 나타냅니다."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "아이콘 선택"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "표시될 위치"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "트리에 표시 될 메뉴 항목의 텍스트입니다."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr "선택하기"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "이 메뉴 항목이 첫 번째 수준에있을 때 표시 할 아이콘을 선택합니다."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "아이콘 선택"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Alias.po b/Localization/ko/OrchardCore.Alias.po
index 419bded7d1dd0..de98a1d97924c 100644
--- a/Localization/ko/OrchardCore.Alias.po
+++ b/Localization/ko/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ko/OrchardCore.ArchiveLater.po b/Localization/ko/OrchardCore.ArchiveLater.po
index aeffd140b755a..6aae6efd42498 100644
--- a/Localization/ko/OrchardCore.ArchiveLater.po
+++ b/Localization/ko/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ko/OrchardCore.AuditTrail.po b/Localization/ko/OrchardCore.AuditTrail.po
index 640947ed1efe0..88d7aa2d0928d 100644
--- a/Localization/ko/OrchardCore.AuditTrail.po
+++ b/Localization/ko/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/ko/OrchardCore.Autoroute.po b/Localization/ko/OrchardCore.Autoroute.po
index d4364453b5fdd..b5deea83a0582 100644
--- a/Localization/ko/OrchardCore.Autoroute.po
+++ b/Localization/ko/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ko/OrchardCore.BackgroundTasks.po b/Localization/ko/OrchardCore.BackgroundTasks.po
index 47bf58f543c0e..47b5d1b601e4e 100644
--- a/Localization/ko/OrchardCore.BackgroundTasks.po
+++ b/Localization/ko/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/ko/OrchardCore.ContentFields.po b/Localization/ko/OrchardCore.ContentFields.po
index dc8d8f44912be..72e940afeafaa 100644
--- a/Localization/ko/OrchardCore.ContentFields.po
+++ b/Localization/ko/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/ko/OrchardCore.ContentLocalization.po b/Localization/ko/OrchardCore.ContentLocalization.po
index 1495504dda253..0977ebd8025d0 100644
--- a/Localization/ko/OrchardCore.ContentLocalization.po
+++ b/Localization/ko/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/ko/OrchardCore.ContentPreview.po b/Localization/ko/OrchardCore.ContentPreview.po
index 9e781d64f4b23..fd2f1e391d732 100644
--- a/Localization/ko/OrchardCore.ContentPreview.po
+++ b/Localization/ko/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ko/OrchardCore.ContentTypes.po b/Localization/ko/OrchardCore.ContentTypes.po
index 280a86dfd14cd..338aa41e768bc 100644
--- a/Localization/ko/OrchardCore.ContentTypes.po
+++ b/Localization/ko/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Contents.po b/Localization/ko/OrchardCore.Contents.po
index eb26c180cd0a7..d2e4483f8cc89 100644
--- a/Localization/ko/OrchardCore.Contents.po
+++ b/Localization/ko/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/ko/OrchardCore.CustomSettings.po b/Localization/ko/OrchardCore.CustomSettings.po
index 49de91a75d4eb..c6c91e68a00ee 100644
--- a/Localization/ko/OrchardCore.CustomSettings.po
+++ b/Localization/ko/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/ko/OrchardCore.Data.YesSql.po b/Localization/ko/OrchardCore.Data.YesSql.po
index e98285a4230f2..c9bbe3537e4f0 100644
--- a/Localization/ko/OrchardCore.Data.YesSql.po
+++ b/Localization/ko/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Demo.po b/Localization/ko/OrchardCore.Demo.po
index 9d934ddfa7842..e5a76667603d7 100644
--- a/Localization/ko/OrchardCore.Demo.po
+++ b/Localization/ko/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/ko/OrchardCore.Deployment.Remote.po b/Localization/ko/OrchardCore.Deployment.Remote.po
index 7a746f77f8f2c..bc3f127dc813d 100644
--- a/Localization/ko/OrchardCore.Deployment.Remote.po
+++ b/Localization/ko/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/ko/OrchardCore.Deployment.po b/Localization/ko/OrchardCore.Deployment.po
index e0339aa0cffbe..9dd8ff9eeeebd 100644
--- a/Localization/ko/OrchardCore.Deployment.po
+++ b/Localization/ko/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/ko/OrchardCore.Diagnostics.po b/Localization/ko/OrchardCore.Diagnostics.po
index d2df7a1d79c16..d6ede1ea2666b 100644
--- a/Localization/ko/OrchardCore.Diagnostics.po
+++ b/Localization/ko/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2021-07-15 18:34\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/ko/OrchardCore.Email.Abstractions.po b/Localization/ko/OrchardCore.Email.Abstractions.po
index f67c028ddffa2..b0e5c81811811 100644
--- a/Localization/ko/OrchardCore.Email.Abstractions.po
+++ b/Localization/ko/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Email.po b/Localization/ko/OrchardCore.Email.po
index 7787ed9c920d4..68ef83a7d3e19 100644
--- a/Localization/ko/OrchardCore.Email.po
+++ b/Localization/ko/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/ko/OrchardCore.Facebook.po b/Localization/ko/OrchardCore.Facebook.po
index 4f9f897716aee..5bec152f0132c 100644
--- a/Localization/ko/OrchardCore.Facebook.po
+++ b/Localization/ko/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/ko/OrchardCore.Features.po b/Localization/ko/OrchardCore.Features.po
index b00ec4da7c787..c872f263cdc65 100644
--- a/Localization/ko/OrchardCore.Features.po
+++ b/Localization/ko/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Flows.po b/Localization/ko/OrchardCore.Flows.po
index 3f099ed79fcce..d4eb888435b2e 100644
--- a/Localization/ko/OrchardCore.Flows.po
+++ b/Localization/ko/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/ko/OrchardCore.Forms.po b/Localization/ko/OrchardCore.Forms.po
index 0d4f5907fbcce..1bbb74f0ca61a 100644
--- a/Localization/ko/OrchardCore.Forms.po
+++ b/Localization/ko/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/ko/OrchardCore.GitHub.po b/Localization/ko/OrchardCore.GitHub.po
index fa22c70b5b9a1..48ea89480f34a 100644
--- a/Localization/ko/OrchardCore.GitHub.po
+++ b/Localization/ko/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ko/OrchardCore.Google.po b/Localization/ko/OrchardCore.Google.po
index 2e03522cc738d..5426a84237fac 100644
--- a/Localization/ko/OrchardCore.Google.po
+++ b/Localization/ko/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/ko/OrchardCore.Html.po b/Localization/ko/OrchardCore.Html.po
index bd1ecedaf6c04..433f4e629fe78 100644
--- a/Localization/ko/OrchardCore.Html.po
+++ b/Localization/ko/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Https.po b/Localization/ko/OrchardCore.Https.po
index 173ec34e97853..145f7dd62dfdc 100644
--- a/Localization/ko/OrchardCore.Https.po
+++ b/Localization/ko/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/ko/OrchardCore.Infrastructure.Abstractions.po b/Localization/ko/OrchardCore.Infrastructure.Abstractions.po
index 76cf906b2955d..c8b76f40ca799 100644
--- a/Localization/ko/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/ko/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/ko/OrchardCore.Layers.po b/Localization/ko/OrchardCore.Layers.po
index aebac7c2b7e60..673848a4f77a9 100644
--- a/Localization/ko/OrchardCore.Layers.po
+++ b/Localization/ko/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/ko/OrchardCore.Liquid.po b/Localization/ko/OrchardCore.Liquid.po
index 0b136a9ddd729..fcedf7321beb3 100644
--- a/Localization/ko/OrchardCore.Liquid.po
+++ b/Localization/ko/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/ko/OrchardCore.Lists.po b/Localization/ko/OrchardCore.Lists.po
index 8f3a761454c4f..4cb9d15906065 100644
--- a/Localization/ko/OrchardCore.Lists.po
+++ b/Localization/ko/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/ko/OrchardCore.Localization.po b/Localization/ko/OrchardCore.Localization.po
index 5363b2ec34203..bcbb0ac605ccc 100644
--- a/Localization/ko/OrchardCore.Localization.po
+++ b/Localization/ko/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/ko/OrchardCore.Markdown.po b/Localization/ko/OrchardCore.Markdown.po
index 2b81640d658e0..572742ee4427b 100644
--- a/Localization/ko/OrchardCore.Markdown.po
+++ b/Localization/ko/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ko/OrchardCore.Media.po b/Localization/ko/OrchardCore.Media.po
index 0e1e11ba177b1..51e67b1916e5a 100644
--- a/Localization/ko/OrchardCore.Media.po
+++ b/Localization/ko/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,43 +1083,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ko/OrchardCore.Menu.po b/Localization/ko/OrchardCore.Menu.po
index a7cd3036e2968..87a1a27ffe54b 100644
--- a/Localization/ko/OrchardCore.Menu.po
+++ b/Localization/ko/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/ko/OrchardCore.Microsoft.Authentication.po b/Localization/ko/OrchardCore.Microsoft.Authentication.po
index bfc19157edfc6..6473205d60c92 100644
--- a/Localization/ko/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/ko/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ko/OrchardCore.Navigation.po b/Localization/ko/OrchardCore.Navigation.po
index 08691cbc77170..fd63582e1c746 100644
--- a/Localization/ko/OrchardCore.Navigation.po
+++ b/Localization/ko/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Notifications.po b/Localization/ko/OrchardCore.Notifications.po
index a4e929cb5f7bb..e4aee5f673bd2 100644
--- a/Localization/ko/OrchardCore.Notifications.po
+++ b/Localization/ko/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,10 +375,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/ko/OrchardCore.OpenId.po b/Localization/ko/OrchardCore.OpenId.po
index e8300eca7a1b4..39949c3714afa 100644
--- a/Localization/ko/OrchardCore.OpenId.po
+++ b/Localization/ko/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/ko/OrchardCore.Placements.po b/Localization/ko/OrchardCore.Placements.po
index 594b1752d4119..0d3ec06585581 100644
--- a/Localization/ko/OrchardCore.Placements.po
+++ b/Localization/ko/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/ko/OrchardCore.ProjectTemplates.po b/Localization/ko/OrchardCore.ProjectTemplates.po
index 8781ff4f1ec93..7f045f9256ad2 100644
--- a/Localization/ko/OrchardCore.ProjectTemplates.po
+++ b/Localization/ko/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-18 20:29\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "표시"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ko/OrchardCore.PublishLater.po b/Localization/ko/OrchardCore.PublishLater.po
index 358a7ac02d35f..759f0ddfa3f67 100644
--- a/Localization/ko/OrchardCore.PublishLater.po
+++ b/Localization/ko/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ko/OrchardCore.Queries.po b/Localization/ko/OrchardCore.Queries.po
index 9ad82fd2700ec..5dd1cdeb6f20e 100644
--- a/Localization/ko/OrchardCore.Queries.po
+++ b/Localization/ko/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/ko/OrchardCore.ReCaptcha.Core.po b/Localization/ko/OrchardCore.ReCaptcha.Core.po
index 87441d80ae48e..0c7d35970749f 100644
--- a/Localization/ko/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/ko/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/ko/OrchardCore.ReCaptcha.po b/Localization/ko/OrchardCore.ReCaptcha.po
index d7a4b2b579bca..2fdcfda543732 100644
--- a/Localization/ko/OrchardCore.ReCaptcha.po
+++ b/Localization/ko/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/ko/OrchardCore.Recipes.Core.po b/Localization/ko/OrchardCore.Recipes.Core.po
index 926403298dea6..0241d122c94b0 100644
--- a/Localization/ko/OrchardCore.Recipes.Core.po
+++ b/Localization/ko/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/ko/OrchardCore.Roles.po b/Localization/ko/OrchardCore.Roles.po
index dac6cc85476d9..c1bc883d1e5ff 100644
--- a/Localization/ko/OrchardCore.Roles.po
+++ b/Localization/ko/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/ko/OrchardCore.Rules.po b/Localization/ko/OrchardCore.Rules.po
index 015bbb72f994e..df73c29674b24 100644
--- a/Localization/ko/OrchardCore.Rules.po
+++ b/Localization/ko/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/ko/OrchardCore.Search.Elasticsearch.po b/Localization/ko/OrchardCore.Search.Elasticsearch.po
index f9c9d63d2378f..ddd586fa6ed64 100644
--- a/Localization/ko/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/ko/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/ko/OrchardCore.Search.Lucene.po b/Localization/ko/OrchardCore.Search.Lucene.po
index d268ac444ba21..a253ef01d43b2 100644
--- a/Localization/ko/OrchardCore.Search.Lucene.po
+++ b/Localization/ko/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Search.po b/Localization/ko/OrchardCore.Search.po
index 85aa5c45714b0..aaf9306d743d6 100644
--- a/Localization/ko/OrchardCore.Search.po
+++ b/Localization/ko/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/ko/OrchardCore.Security.po b/Localization/ko/OrchardCore.Security.po
index c4e4440468255..a994e481e2a5a 100644
--- a/Localization/ko/OrchardCore.Security.po
+++ b/Localization/ko/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/ko/OrchardCore.Seo.po b/Localization/ko/OrchardCore.Seo.po
index 6fe2eb52424b1..ce1ad936db078 100644
--- a/Localization/ko/OrchardCore.Seo.po
+++ b/Localization/ko/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/ko/OrchardCore.Settings.po b/Localization/ko/OrchardCore.Settings.po
index 356ffdd91143d..d1f53f8c87f3e 100644
--- a/Localization/ko/OrchardCore.Settings.po
+++ b/Localization/ko/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/ko/OrchardCore.Setup.Core.po b/Localization/ko/OrchardCore.Setup.Core.po
index cdabfeddef89e..1e596f2f23ac7 100644
--- a/Localization/ko/OrchardCore.Setup.Core.po
+++ b/Localization/ko/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/ko/OrchardCore.Setup.po b/Localization/ko/OrchardCore.Setup.po
index f6887ded26ce1..877b770211bab 100644
--- a/Localization/ko/OrchardCore.Setup.po
+++ b/Localization/ko/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/ko/OrchardCore.Shortcodes.po b/Localization/ko/OrchardCore.Shortcodes.po
index ef2d79fc653c3..2ccab0c3c065e 100644
--- a/Localization/ko/OrchardCore.Shortcodes.po
+++ b/Localization/ko/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/ko/OrchardCore.Sitemaps.po b/Localization/ko/OrchardCore.Sitemaps.po
index 8aefd2913abe3..4e0af95ef5ded 100644
--- a/Localization/ko/OrchardCore.Sitemaps.po
+++ b/Localization/ko/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/ko/OrchardCore.Sms.po b/Localization/ko/OrchardCore.Sms.po
index 441ac9dc0dd2e..746c40e1b6396 100644
--- a/Localization/ko/OrchardCore.Sms.po
+++ b/Localization/ko/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/ko/OrchardCore.Spatial.po b/Localization/ko/OrchardCore.Spatial.po
index 91eb6279abbd2..e064a3013fd92 100644
--- a/Localization/ko/OrchardCore.Spatial.po
+++ b/Localization/ko/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ko/OrchardCore.Taxonomies.po b/Localization/ko/OrchardCore.Taxonomies.po
index 4bf1834fc1cb2..9caba6790f9ee 100644
--- a/Localization/ko/OrchardCore.Taxonomies.po
+++ b/Localization/ko/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Templates.Cms.Module.po b/Localization/ko/OrchardCore.Templates.Cms.Module.po
index b3369ccf9b940..301df4fca1045 100644
--- a/Localization/ko/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/ko/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-18 20:29\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "표시"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ko/OrchardCore.Templates.po b/Localization/ko/OrchardCore.Templates.po
index 36192bc3a3725..040cafda55110 100644
--- a/Localization/ko/OrchardCore.Templates.po
+++ b/Localization/ko/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/ko/OrchardCore.Tenants.po b/Localization/ko/OrchardCore.Tenants.po
index f84a07acb961a..d11e56ebb0ca5 100644
--- a/Localization/ko/OrchardCore.Tenants.po
+++ b/Localization/ko/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/ko/OrchardCore.Tests.po b/Localization/ko/OrchardCore.Tests.po
index 85fbf74ef66e6..35911afe37cdf 100644
--- a/Localization/ko/OrchardCore.Tests.po
+++ b/Localization/ko/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Themes.po b/Localization/ko/OrchardCore.Themes.po
index 2f9eee1e6cdc1..fe2c916ff86f3 100644
--- a/Localization/ko/OrchardCore.Themes.po
+++ b/Localization/ko/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ko/OrchardCore.Title.po b/Localization/ko/OrchardCore.Title.po
index 1cbb1b7daf116..f387a24a4f51f 100644
--- a/Localization/ko/OrchardCore.Title.po
+++ b/Localization/ko/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ko/OrchardCore.Twitter.po b/Localization/ko/OrchardCore.Twitter.po
index 7625f874afd2f..152091c4a923d 100644
--- a/Localization/ko/OrchardCore.Twitter.po
+++ b/Localization/ko/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/ko/OrchardCore.Users.Core.po b/Localization/ko/OrchardCore.Users.Core.po
index c36a3d99ab676..6a95b7c56f8bf 100644
--- a/Localization/ko/OrchardCore.Users.Core.po
+++ b/Localization/ko/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/ko/OrchardCore.Users.po b/Localization/ko/OrchardCore.Users.po
index b6c6c13880478..d8b713823afc5 100644
--- a/Localization/ko/OrchardCore.Users.po
+++ b/Localization/ko/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3416,7 +3488,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3440,16 +3512,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/ko/OrchardCore.Widgets.po b/Localization/ko/OrchardCore.Widgets.po
index f551a5d96ec40..399509d91a350 100644
--- a/Localization/ko/OrchardCore.Widgets.po
+++ b/Localization/ko/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/ko/OrchardCore.Workflows.po b/Localization/ko/OrchardCore.Workflows.po
index aa3ad483f1990..b89bdce8df12a 100644
--- a/Localization/ko/OrchardCore.Workflows.po
+++ b/Localization/ko/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1704,40 +1768,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1834,12 +1912,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1873,7 +1950,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1903,7 +1980,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1915,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1963,7 +2040,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1975,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2005,7 +2082,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2017,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2047,7 +2124,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2059,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2089,7 +2166,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2101,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2137,7 +2214,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2173,7 +2250,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2227,7 +2304,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2239,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2275,7 +2352,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2299,3 +2376,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/ko/TheAdmin.po b/Localization/ko/TheAdmin.po
index d15154bce9d34..39aff2b7ab1a3 100644
--- a/Localization/ko/TheAdmin.po
+++ b/Localization/ko/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "메뉴 접기/ 펼치기"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "삭제"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "해당 항목을 삭제하시겠습니까?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "확인"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "취소"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ko/TheAgencyTheme.po b/Localization/ko/TheAgencyTheme.po
index f55e9c7c952a0..e0d2e73e2ce3c 100644
--- a/Localization/ko/TheAgencyTheme.po
+++ b/Localization/ko/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ko/TheBlogTheme.po b/Localization/ko/TheBlogTheme.po
index 84e1370f18736..66e50387f94d7 100644
--- a/Localization/ko/TheBlogTheme.po
+++ b/Localization/ko/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ko/TheTheme.po b/Localization/ko/TheTheme.po
index d39baef26a904..fb3c825c6a134 100644
--- a/Localization/ko/TheTheme.po
+++ b/Localization/ko/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/lt/OrchardCore.Admin.po b/Localization/lt/OrchardCore.Admin.po
index 487163a0ae23b..ce36a4efd824e 100644
--- a/Localization/lt/OrchardCore.Admin.po
+++ b/Localization/lt/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Nesivaržydami klaidžiokite po meniu ir atraskite visas galimybes."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/lt/OrchardCore.AdminDashboard.po b/Localization/lt/OrchardCore.AdminDashboard.po
index b0bd556f290bc..39b6da3d35526 100644
--- a/Localization/lt/OrchardCore.AdminDashboard.po
+++ b/Localization/lt/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/lt/OrchardCore.AdminMenu.po b/Localization/lt/OrchardCore.AdminMenu.po
index 86b99486e4dee..bcd606e6dc93b 100644
--- a/Localization/lt/OrchardCore.AdminMenu.po
+++ b/Localization/lt/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Kurti administravimo meniu {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Pavadinimas"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Kurti mazgą"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Keisti administravimo meniu: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Pavadinimas"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Keisti mazgą"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Šios nuorodos pirmenybė būti rodoma kaip aktyvia vietoj kitos, kai dvi nuorodos nurodo tą patį URL adresą. Nuoroda turinti didžiausią reikšmę bus aktyvi naršymo juostoje."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Šios nuorodos padėties eiliškumas administravimo meniu."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Nuoroda"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Nuorodos tekstas bus rodomas medyje."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Nuorodos URL adresas. Nuoroda bus rodoma, jei ji arba žemesnio lygio nuoroda turės URL adresą. URL adresas yra santykinis administravimo puslapiui"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Pasirinkite piktogramą"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Vietaženklis"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Meniu elemento tekstas, kaip bus rodomas medyje."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "Parinkti"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Pasirinkite piktogramą, kuri bus rodoma, kai šis meniu elementas bus pirmame lygyje."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Pasirinkite piktogramą"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Alias.po b/Localization/lt/OrchardCore.Alias.po
index 85ede89a88348..ee7356868c1c2 100644
--- a/Localization/lt/OrchardCore.Alias.po
+++ b/Localization/lt/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Šablone nėra tinkamų „Liquid“ išraiškų. Išsamiau: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Palikę tuščią sugeneruosite iš naujo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/lt/OrchardCore.ArchiveLater.po b/Localization/lt/OrchardCore.ArchiveLater.po
index 1ad6e0e26c13e..cb4f624ca663b 100644
--- a/Localization/lt/OrchardCore.ArchiveLater.po
+++ b/Localization/lt/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/lt/OrchardCore.AuditTrail.po b/Localization/lt/OrchardCore.AuditTrail.po
index 8ca073bcc3b4e..50525d1ac235f 100644
--- a/Localization/lt/OrchardCore.AuditTrail.po
+++ b/Localization/lt/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/lt/OrchardCore.Autoroute.po b/Localization/lt/OrchardCore.Autoroute.po
index 03dd224f2dd46..9187f7acb735e 100644
--- a/Localization/lt/OrchardCore.Autoroute.po
+++ b/Localization/lt/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/lt/OrchardCore.BackgroundTasks.po b/Localization/lt/OrchardCore.BackgroundTasks.po
index 74c29c98481c8..91be9bac47e28 100644
--- a/Localization/lt/OrchardCore.BackgroundTasks.po
+++ b/Localization/lt/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/lt/OrchardCore.ContentFields.po b/Localization/lt/OrchardCore.ContentFields.po
index 2335721d49b6a..ae60155ce5ad9 100644
--- a/Localization/lt/OrchardCore.ContentFields.po
+++ b/Localization/lt/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Perjungti"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standartinis"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Rodomas šio lauko užuominos tekstas redaktoriuje."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Turinio elementų nėra."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nepaskelbta"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Ieškokite rašydami"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Pasirinkti"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Pašalinti"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Rezultatų nerasta"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Pašalinti"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Rezultatų nerasta"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Leisti pasirinkti kelis elementus."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Rodomi turinio tipai. Pasirinkite bent vieną."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Intervalas"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Nieko"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Suktukas"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Ar reikšmė būtina."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Rodomas šio lauko užuominos tekstas redaktoriuje."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Rodoma užuomina kai įvestis tuščia. (nebūtina)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Skaičių kiekis po kablelio."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Mažiausia galima reikšmė. (nebūtina)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Didžiausia galima reikšmė. (nebūtina)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL adresas"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standartinis"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standartinis"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/lt/OrchardCore.ContentLocalization.po b/Localization/lt/OrchardCore.ContentLocalization.po
index 6c66921e0d1a8..ce83eb6c730dc 100644
--- a/Localization/lt/OrchardCore.ContentLocalization.po
+++ b/Localization/lt/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/lt/OrchardCore.ContentPreview.po b/Localization/lt/OrchardCore.ContentPreview.po
index 00784baf15cee..804829184ff41 100644
--- a/Localization/lt/OrchardCore.ContentPreview.po
+++ b/Localization/lt/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/lt/OrchardCore.ContentTypes.po b/Localization/lt/OrchardCore.ContentTypes.po
index c34e1697ae3bb..8bdacae1a2680 100644
--- a/Localization/lt/OrchardCore.ContentTypes.po
+++ b/Localization/lt/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Contents.po b/Localization/lt/OrchardCore.Contents.po
index 8214c893758bd..9d27fd3c99a05 100644
--- a/Localization/lt/OrchardCore.Contents.po
+++ b/Localization/lt/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/lt/OrchardCore.CustomSettings.po b/Localization/lt/OrchardCore.CustomSettings.po
index 9957fea4401fb..06b58a5e2da5b 100644
--- a/Localization/lt/OrchardCore.CustomSettings.po
+++ b/Localization/lt/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/lt/OrchardCore.Data.YesSql.po b/Localization/lt/OrchardCore.Data.YesSql.po
index d6f8a2278dac1..b528fd9f43066 100644
--- a/Localization/lt/OrchardCore.Data.YesSql.po
+++ b/Localization/lt/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Demo.po b/Localization/lt/OrchardCore.Demo.po
index 9d68111c9a486..4ab6fa98c523c 100644
--- a/Localization/lt/OrchardCore.Demo.po
+++ b/Localization/lt/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/lt/OrchardCore.Deployment.Remote.po b/Localization/lt/OrchardCore.Deployment.Remote.po
index 35c8961d289b8..8cb9284b988f3 100644
--- a/Localization/lt/OrchardCore.Deployment.Remote.po
+++ b/Localization/lt/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/lt/OrchardCore.Deployment.po b/Localization/lt/OrchardCore.Deployment.po
index 4f55440fbe2c0..829b27aed7947 100644
--- a/Localization/lt/OrchardCore.Deployment.po
+++ b/Localization/lt/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/lt/OrchardCore.Diagnostics.po b/Localization/lt/OrchardCore.Diagnostics.po
index c2a269889f238..57a7ab95fcc43 100644
--- a/Localization/lt/OrchardCore.Diagnostics.po
+++ b/Localization/lt/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2021-07-15 18:34\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/lt/OrchardCore.Email.Abstractions.po b/Localization/lt/OrchardCore.Email.Abstractions.po
index 42cf30526aa1e..59ce4a9261e6f 100644
--- a/Localization/lt/OrchardCore.Email.Abstractions.po
+++ b/Localization/lt/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Email.po b/Localization/lt/OrchardCore.Email.po
index 61dd13935bf39..f266a190119f8 100644
--- a/Localization/lt/OrchardCore.Email.po
+++ b/Localization/lt/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/lt/OrchardCore.Facebook.po b/Localization/lt/OrchardCore.Facebook.po
index 7f765569f0e66..d7f4dd57756ae 100644
--- a/Localization/lt/OrchardCore.Facebook.po
+++ b/Localization/lt/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/lt/OrchardCore.Features.po b/Localization/lt/OrchardCore.Features.po
index 67f60af1a096d..b551329d4d2d9 100644
--- a/Localization/lt/OrchardCore.Features.po
+++ b/Localization/lt/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Čia tuščia!</strong> Paieškoje nėra nei vieno rezultato."
diff --git a/Localization/lt/OrchardCore.Flows.po b/Localization/lt/OrchardCore.Flows.po
index fc134a26ea3aa..faaca09697e9c 100644
--- a/Localization/lt/OrchardCore.Flows.po
+++ b/Localization/lt/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/lt/OrchardCore.Forms.po b/Localization/lt/OrchardCore.Forms.po
index 30c62c1b9f75a..fbbc4a62e2b49 100644
--- a/Localization/lt/OrchardCore.Forms.po
+++ b/Localization/lt/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/lt/OrchardCore.GitHub.po b/Localization/lt/OrchardCore.GitHub.po
index 8e7865721bab6..3a6a9485cee80 100644
--- a/Localization/lt/OrchardCore.GitHub.po
+++ b/Localization/lt/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/lt/OrchardCore.Google.po b/Localization/lt/OrchardCore.Google.po
index 8007f4ae9e2bb..9e3233c45b63a 100644
--- a/Localization/lt/OrchardCore.Google.po
+++ b/Localization/lt/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/lt/OrchardCore.Html.po b/Localization/lt/OrchardCore.Html.po
index 7914eca82cca1..16f34cf962ef1 100644
--- a/Localization/lt/OrchardCore.Html.po
+++ b/Localization/lt/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Https.po b/Localization/lt/OrchardCore.Https.po
index 24df753f44dc1..1d9bc3fb1106b 100644
--- a/Localization/lt/OrchardCore.Https.po
+++ b/Localization/lt/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/lt/OrchardCore.Infrastructure.Abstractions.po b/Localization/lt/OrchardCore.Infrastructure.Abstractions.po
index b5ca9fe0e441e..8a74af7109e0a 100644
--- a/Localization/lt/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/lt/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-03-05 10:50\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/lt/OrchardCore.Layers.po b/Localization/lt/OrchardCore.Layers.po
index bc0cfef4010d9..836be04c8490f 100644
--- a/Localization/lt/OrchardCore.Layers.po
+++ b/Localization/lt/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/lt/OrchardCore.Liquid.po b/Localization/lt/OrchardCore.Liquid.po
index 14f6eeb3ccdc9..ab3843bf3436f 100644
--- a/Localization/lt/OrchardCore.Liquid.po
+++ b/Localization/lt/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/lt/OrchardCore.Lists.po b/Localization/lt/OrchardCore.Lists.po
index 61718ee3076fc..35b89704e9e02 100644
--- a/Localization/lt/OrchardCore.Lists.po
+++ b/Localization/lt/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/lt/OrchardCore.Localization.po b/Localization/lt/OrchardCore.Localization.po
index cf85b787ae51f..33771757c92ce 100644
--- a/Localization/lt/OrchardCore.Localization.po
+++ b/Localization/lt/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/lt/OrchardCore.Markdown.po b/Localization/lt/OrchardCore.Markdown.po
index 5d56a888b6bde..f946a6b2e0738 100644
--- a/Localization/lt/OrchardCore.Markdown.po
+++ b/Localization/lt/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/lt/OrchardCore.Media.po b/Localization/lt/OrchardCore.Media.po
index 1423b008cfe00..3747cdfd3f4f3 100644
--- a/Localization/lt/OrchardCore.Media.po
+++ b/Localization/lt/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/lt/OrchardCore.Menu.po b/Localization/lt/OrchardCore.Menu.po
index 9183b4da81e84..c7ba35b2fbc15 100644
--- a/Localization/lt/OrchardCore.Menu.po
+++ b/Localization/lt/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/lt/OrchardCore.Microsoft.Authentication.po b/Localization/lt/OrchardCore.Microsoft.Authentication.po
index a1041478427f4..dc9e059d6d32f 100644
--- a/Localization/lt/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/lt/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/lt/OrchardCore.Navigation.po b/Localization/lt/OrchardCore.Navigation.po
index a93cd480a7709..b786fe0cb42bf 100644
--- a/Localization/lt/OrchardCore.Navigation.po
+++ b/Localization/lt/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Notifications.po b/Localization/lt/OrchardCore.Notifications.po
index 1eb8850b156b4..0563dc857bc3b 100644
--- a/Localization/lt/OrchardCore.Notifications.po
+++ b/Localization/lt/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/lt/OrchardCore.OpenId.po b/Localization/lt/OrchardCore.OpenId.po
index 10c5d7d53b148..768fccfca17fe 100644
--- a/Localization/lt/OrchardCore.OpenId.po
+++ b/Localization/lt/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/lt/OrchardCore.Placements.po b/Localization/lt/OrchardCore.Placements.po
index 1a914be32e771..ba64cd16d7315 100644
--- a/Localization/lt/OrchardCore.Placements.po
+++ b/Localization/lt/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/lt/OrchardCore.ProjectTemplates.po b/Localization/lt/OrchardCore.ProjectTemplates.po
index c36ea165d8449..d36bb04fbd5aa 100644
--- a/Localization/lt/OrchardCore.ProjectTemplates.po
+++ b/Localization/lt/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:32\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/lt/OrchardCore.PublishLater.po b/Localization/lt/OrchardCore.PublishLater.po
index 1fbadd13d2343..a18cdf9fa0a40 100644
--- a/Localization/lt/OrchardCore.PublishLater.po
+++ b/Localization/lt/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/lt/OrchardCore.Queries.po b/Localization/lt/OrchardCore.Queries.po
index 4f559b0507d7c..c5fe7fe5aa51e 100644
--- a/Localization/lt/OrchardCore.Queries.po
+++ b/Localization/lt/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/lt/OrchardCore.ReCaptcha.Core.po b/Localization/lt/OrchardCore.ReCaptcha.Core.po
index 007ae20b2f29a..bfc2206688f75 100644
--- a/Localization/lt/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/lt/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/lt/OrchardCore.ReCaptcha.po b/Localization/lt/OrchardCore.ReCaptcha.po
index d4254c6f0f6c9..d29fd18b72dc8 100644
--- a/Localization/lt/OrchardCore.ReCaptcha.po
+++ b/Localization/lt/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/lt/OrchardCore.Recipes.Core.po b/Localization/lt/OrchardCore.Recipes.Core.po
index 7d180790480d6..a7d5883fd33e1 100644
--- a/Localization/lt/OrchardCore.Recipes.Core.po
+++ b/Localization/lt/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/lt/OrchardCore.Roles.po b/Localization/lt/OrchardCore.Roles.po
index 1d3d0d452fc62..1e647a9edbbfd 100644
--- a/Localization/lt/OrchardCore.Roles.po
+++ b/Localization/lt/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/lt/OrchardCore.Rules.po b/Localization/lt/OrchardCore.Rules.po
index 35a22763f9ff7..ae540dd4199f4 100644
--- a/Localization/lt/OrchardCore.Rules.po
+++ b/Localization/lt/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/lt/OrchardCore.Search.Elasticsearch.po b/Localization/lt/OrchardCore.Search.Elasticsearch.po
index a60271883edc2..64767a51523bb 100644
--- a/Localization/lt/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/lt/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/lt/OrchardCore.Search.Lucene.po b/Localization/lt/OrchardCore.Search.Lucene.po
index 13f3e666492b1..757737267722b 100644
--- a/Localization/lt/OrchardCore.Search.Lucene.po
+++ b/Localization/lt/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Search.po b/Localization/lt/OrchardCore.Search.po
index 63422346f21d7..277d56759e925 100644
--- a/Localization/lt/OrchardCore.Search.po
+++ b/Localization/lt/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/lt/OrchardCore.Security.po b/Localization/lt/OrchardCore.Security.po
index c9aa29c782738..ab611432deeba 100644
--- a/Localization/lt/OrchardCore.Security.po
+++ b/Localization/lt/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/lt/OrchardCore.Seo.po b/Localization/lt/OrchardCore.Seo.po
index 9acc8bc4e5b7b..4aa552ecf9afb 100644
--- a/Localization/lt/OrchardCore.Seo.po
+++ b/Localization/lt/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/lt/OrchardCore.Settings.po b/Localization/lt/OrchardCore.Settings.po
index 76aaf87960003..4a5b332d07bf3 100644
--- a/Localization/lt/OrchardCore.Settings.po
+++ b/Localization/lt/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/lt/OrchardCore.Setup.Core.po b/Localization/lt/OrchardCore.Setup.Core.po
index bfa59b6588304..d1b124ea88667 100644
--- a/Localization/lt/OrchardCore.Setup.Core.po
+++ b/Localization/lt/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/lt/OrchardCore.Setup.po b/Localization/lt/OrchardCore.Setup.po
index 5d0264290514d..873529bf3d3f6 100644
--- a/Localization/lt/OrchardCore.Setup.po
+++ b/Localization/lt/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/lt/OrchardCore.Shortcodes.po b/Localization/lt/OrchardCore.Shortcodes.po
index 97a7573f2236b..1212673a37422 100644
--- a/Localization/lt/OrchardCore.Shortcodes.po
+++ b/Localization/lt/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/lt/OrchardCore.Sitemaps.po b/Localization/lt/OrchardCore.Sitemaps.po
index 050a712279f9e..c2e10b67a04bd 100644
--- a/Localization/lt/OrchardCore.Sitemaps.po
+++ b/Localization/lt/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/lt/OrchardCore.Sms.po b/Localization/lt/OrchardCore.Sms.po
index e1bb3995c2d73..0c9cc18864c85 100644
--- a/Localization/lt/OrchardCore.Sms.po
+++ b/Localization/lt/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/lt/OrchardCore.Spatial.po b/Localization/lt/OrchardCore.Spatial.po
index 89c6e25d8c72f..e2e4baa2936ef 100644
--- a/Localization/lt/OrchardCore.Spatial.po
+++ b/Localization/lt/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/lt/OrchardCore.Taxonomies.po b/Localization/lt/OrchardCore.Taxonomies.po
index 49fee7afdc091..70fc1da99f89f 100644
--- a/Localization/lt/OrchardCore.Taxonomies.po
+++ b/Localization/lt/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Templates.Cms.Module.po b/Localization/lt/OrchardCore.Templates.Cms.Module.po
index 5ce0ad884b895..d662447e2bd6d 100644
--- a/Localization/lt/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/lt/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/lt/OrchardCore.Templates.po b/Localization/lt/OrchardCore.Templates.po
index f35086d82e976..1029dc92372ac 100644
--- a/Localization/lt/OrchardCore.Templates.po
+++ b/Localization/lt/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/lt/OrchardCore.Tenants.po b/Localization/lt/OrchardCore.Tenants.po
index 0347374bba67a..7707cd1d8294d 100644
--- a/Localization/lt/OrchardCore.Tenants.po
+++ b/Localization/lt/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/lt/OrchardCore.Tests.po b/Localization/lt/OrchardCore.Tests.po
index 89818f44eabff..22c8a0b205f3f 100644
--- a/Localization/lt/OrchardCore.Tests.po
+++ b/Localization/lt/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Themes.po b/Localization/lt/OrchardCore.Themes.po
index b79622de2f13e..3c034893c7aab 100644
--- a/Localization/lt/OrchardCore.Themes.po
+++ b/Localization/lt/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/lt/OrchardCore.Title.po b/Localization/lt/OrchardCore.Title.po
index 4cdf7d67164b6..f8cc6e3078e96 100644
--- a/Localization/lt/OrchardCore.Title.po
+++ b/Localization/lt/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/lt/OrchardCore.Twitter.po b/Localization/lt/OrchardCore.Twitter.po
index 9fd52da2e5bda..53b2606e0aeba 100644
--- a/Localization/lt/OrchardCore.Twitter.po
+++ b/Localization/lt/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/lt/OrchardCore.Users.Core.po b/Localization/lt/OrchardCore.Users.Core.po
index 217c40dd7d2fb..421cd40818497 100644
--- a/Localization/lt/OrchardCore.Users.Core.po
+++ b/Localization/lt/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/lt/OrchardCore.Users.po b/Localization/lt/OrchardCore.Users.po
index c246aaaa28914..45c753e40b7af 100644
--- a/Localization/lt/OrchardCore.Users.po
+++ b/Localization/lt/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,16 +3518,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/lt/OrchardCore.Widgets.po b/Localization/lt/OrchardCore.Widgets.po
index 6d4f4639536ac..5b49081702403 100644
--- a/Localization/lt/OrchardCore.Widgets.po
+++ b/Localization/lt/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/lt/OrchardCore.Workflows.po b/Localization/lt/OrchardCore.Workflows.po
index 5ff13c790809a..88e7f1e20f280 100644
--- a/Localization/lt/OrchardCore.Workflows.po
+++ b/Localization/lt/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Čia tuščia!</strong> Šiuo metu sulaikytų darbo eigų nėra."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/lt/TheAdmin.po b/Localization/lt/TheAdmin.po
index 633533121b597..ceb9b75f1fe8c 100644
--- a/Localization/lt/TheAdmin.po
+++ b/Localization/lt/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/lt/TheAgencyTheme.po b/Localization/lt/TheAgencyTheme.po
index 00818c1ef988e..eeefd7946356a 100644
--- a/Localization/lt/TheAgencyTheme.po
+++ b/Localization/lt/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/lt/TheBlogTheme.po b/Localization/lt/TheBlogTheme.po
index 696dbc2f78287..f99dcbc988025 100644
--- a/Localization/lt/TheBlogTheme.po
+++ b/Localization/lt/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/lt/TheTheme.po b/Localization/lt/TheTheme.po
index 88adaa076440c..b50a7e2a685e0 100644
--- a/Localization/lt/TheTheme.po
+++ b/Localization/lt/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/mk/OrchardCore.Admin.po b/Localization/mk/OrchardCore.Admin.po
index a62ca05249d7a..fb5d5087b5566 100644
--- a/Localization/mk/OrchardCore.Admin.po
+++ b/Localization/mk/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Админ."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Админ. подесувања"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Истражете ги админ. подесувања."
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Слободно прелистајте го менито и откријте ги сите можности."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Админ."
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/mk/OrchardCore.AdminDashboard.po b/Localization/mk/OrchardCore.AdminDashboard.po
index 5487700e1c7b6..b7216dca2894b 100644
--- a/Localization/mk/OrchardCore.AdminDashboard.po
+++ b/Localization/mk/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/mk/OrchardCore.AdminMenu.po b/Localization/mk/OrchardCore.AdminMenu.po
index a14baf8dd6cda..c4cb512f0d10c 100644
--- a/Localization/mk/OrchardCore.AdminMenu.po
+++ b/Localization/mk/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Креирајте админ. мени {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Име"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Креирајте јазол"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Изменете админ. мени {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Измени јазол"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Приоритет на оваа врска кој ќе биде прикажан наместо друга, кога и двете врски покажуваат кон иста URL адреса. Врската со најголема вредност има активен статус во навигацијата."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Редоследот на оваа врска на админ. мени."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Врска"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Текстот на врската, како што ќе биде прикажан во дрвото."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "URL адреса на врската. Врската ќе биде прикажана само ако една од „децата“ има URL адреса. Патеката на URL адресата ќе биде релативна во однос на „коренот“ на админ. сајтот"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Изберете икона"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Текст за пример"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Текстот на елементот од менито, како што ќе биде прикажан во дрвото."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Изберете"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Изберете икона за приказ кога овој елемент на менито е на прво ниво."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Изберете икона"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/mk/OrchardCore.Alias.po b/Localization/mk/OrchardCore.Alias.po
index d8e939ab556b5..555e863ea54e2 100644
--- a/Localization/mk/OrchardCore.Alias.po
+++ b/Localization/mk/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шемата не содржи валиден „Liquid“ израз. Детали: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Оставете празно, за да биде повторно генерирано."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Псевдонимот е генериран и можноста за внес е исклучена"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/mk/OrchardCore.ArchiveLater.po b/Localization/mk/OrchardCore.ArchiveLater.po
index a650b3288cd17..93f9073e8f812 100644
--- a/Localization/mk/OrchardCore.ArchiveLater.po
+++ b/Localization/mk/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/mk/OrchardCore.AuditTrail.po b/Localization/mk/OrchardCore.AuditTrail.po
index 73eb7927e722b..4ee8010f77bf7 100644
--- a/Localization/mk/OrchardCore.AuditTrail.po
+++ b/Localization/mk/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/mk/OrchardCore.Autoroute.po b/Localization/mk/OrchardCore.Autoroute.po
index 5032fc1441396..a233757ded497 100644
--- a/Localization/mk/OrchardCore.Autoroute.po
+++ b/Localization/mk/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-10 11:57\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Изберете за да се оневозможи можноста за автоматско рутирање за овој содржински елемент."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Изберете за да дефинирате подреден содржински елемент кој ќе биде рутиран кон апсолутна патека."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/mk/OrchardCore.BackgroundTasks.po b/Localization/mk/OrchardCore.BackgroundTasks.po
index 14031412f9ce1..2b006cc4350a9 100644
--- a/Localization/mk/OrchardCore.BackgroundTasks.po
+++ b/Localization/mk/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/mk/OrchardCore.ContentFields.po b/Localization/mk/OrchardCore.ContentFields.po
index df4114a5772e2..d92ce64142824 100644
--- a/Localization/mk/OrchardCore.ContentFields.po
+++ b/Localization/mk/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Прекинувач"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Нема содржински елементи."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Стандардно"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Необјавено"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Внесете за пребарување"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Избери"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Отстрани"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Не е пронајден резултат"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Дали да се овозможи избор на повеќе елементи."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Прикажи ги сите содржински видови"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Содржински видови кои би биле прикажани. Изберете барем еден."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Локализирано"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали вредност е задолжителна."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали вредност е задолжителна."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Едитор базиран на „Wysiwyg“ принципот"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документација на опциите"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Текст на врската"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Дали URL адресата е задолжителна."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Користи ја URL адресата на врската"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Текстот за помош кој би бил прикажан за URL адресата."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Текстот за помош кој би бил прикажан за URL адресата."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Помошен текст кој би се прикажал кога внесот на URL адресата е празен."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Помошен текст кој би се прикажал кога внесот на текстот е празен."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Валидна URL адреса препорачана при креирање на содржинскиот елемент."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Нема содржински елементи."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Стандардно"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Необјавено"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Внесете за пребарување"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Избери"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Отстрани"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Не е пронајден резултат"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Дали да се овозможи избор на повеќе елементи."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Содржински видови кои би биле прикажани. Изберете барем еден."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Опсег"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Ниту едно"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Спинер"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали вредност е задолжителна."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Текст за помош кој би бил прикажан кога полето за внес е празно. (опционално)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Бројот на цифри после децималната запирка."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Минималната дозволена вредност. (опционално)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Максималната дозволена вредност. (опционално)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Измени податоци"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "„JSON“ репрезентација на дозволени вредности н.п. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Откажи"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали вредност е задолжителна."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Дали вредност е задолжителна."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Задолжително"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Дали вредност е задолжителна."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Помош"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Ширина"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Ширината на рамката за видео"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Висина"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Висината на рамката за видео"
diff --git a/Localization/mk/OrchardCore.ContentLocalization.po b/Localization/mk/OrchardCore.ContentLocalization.po
index 56ca6ea4bc81d..4a2194b5541fb 100644
--- a/Localization/mk/OrchardCore.ContentLocalization.po
+++ b/Localization/mk/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/mk/OrchardCore.ContentPreview.po b/Localization/mk/OrchardCore.ContentPreview.po
index 010a5cc4b500c..7d9ec493560b9 100644
--- a/Localization/mk/OrchardCore.ContentPreview.po
+++ b/Localization/mk/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шемата не содржи валиден „Liquid“ израз. Детали: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Преглед"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Преглед во офлајн мод"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Преглед на грешка"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/mk/OrchardCore.ContentTypes.po b/Localization/mk/OrchardCore.ContentTypes.po
index 02e25459f68e8..6265286f38e6b 100644
--- a/Localization/mk/OrchardCore.ContentTypes.po
+++ b/Localization/mk/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Делови на содржина"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Името за приказ не е дозволено да биде празно."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Вид со исто име за приказ веќе постои."
@@ -66,10 +66,10 @@ msgstr "Вид со исто име за приказ веќе постои."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Техничкото име не е дозволено да биде празно."
@@ -78,10 +78,10 @@ msgstr "Техничкото име не е дозволено да биде п
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Техничкото име мора да почнува со буква."
@@ -90,10 +90,10 @@ msgstr "Техничкото име мора да почнува со буква
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Техничкото име содржи невалидни знаци."
@@ -101,133 +101,133 @@ msgstr "Техничкото име содржи невалидни знаци."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Вид со исто техничко име веќе постои."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Содржинскиот вид \"{0}\" е креиран."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Подесувањата \"{0}\" се зачувани."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" е отстранет/а."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Делот \"{0}\" е додаден."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Дел со исто име за приказ веќе постои."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Дел со исто техничко име веќе постои."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Делот \"{0}\" е отстранет."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Делот на содржина не може да се креира."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Делот на содржина \"{0}\" е креиран."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Подесувањата на \"{0}\" се зачувани."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Поле со исто име за приказ веќе постои."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Поле со исто техничко име веќе постои."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Полето \"{0}\" е додадено."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Името на приказ е променето во {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Подесувањата на полето \"{0}\" се зачувани."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Полето \"{0}\" е отстрането."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Подесувањата на делот \"{0}\" се зачувани."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Содржинскиот вид не може да е празен."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Не може да се додаде дел до име '{0}'. Истиот веќе постои."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Додај ново поле во \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Името на полето, како што би било прикажано на екрани."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Додади именуван дел во \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Името на делот со можност за повторно користење, како што би било прикажано на екрани."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Техничко име на делот со можност за повторно користење."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Име на делот кој ќе биде прикажан на екрани. Оставете празно за да се користи предодредената вредност."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Избери за дозвола овој дел да биде прикачен повеќе пати."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Името на видот, како што би бил прикажан на екрани."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Нов содржински вид"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Името на видот, како што би бил прикажан на екрани."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Нов содржински вид"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Креирајте"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Измени содржински вид - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Полиња"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Измени"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Отстрани"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Додај поле"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Делови"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Ги содржи полињата на актуелниот вид"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Додади делови"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Додади именуван дел"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Зачувај"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Избриши"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" подесувања за \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Името на полето, како што би било прикажано на екрани."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Техничко име на полето."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Каков вид на едитор треба да се користи?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Каков вид на мод на приказ треба да се користи?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Зачувај"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Откажи"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Некои подесувања на дел кои се заеднички за сите видови, може да се дефинираат во нивото на делот <a href=\"{0}\">дефиниција на делот</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Името на делот, како што би било прикажано на екрани."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Описот на делот, како што би бил прикажан на екрани."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Каков вид на едитор треба да се користи?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Каков вид на мод на приказ треба да се користи?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Зачувај"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Откажи"
diff --git a/Localization/mk/OrchardCore.Contents.po b/Localization/mk/OrchardCore.Contents.po
index cc3cbc1cf403d..52263fff80952 100644
--- a/Localization/mk/OrchardCore.Contents.po
+++ b/Localization/mk/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Објавата на {0} е отповикана."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Сите содржински видови"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Содржина"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Завршено"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Датум кога содржинскиот елемент е креиран или објавен за првпат."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "и продолжи"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Акции"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Содржина"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Нацртот на содржината е зачуван."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Содржински елементи"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Прикажи ги сите содржински видови"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Изберете икона"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Прикажи ги сите содржински видови"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Ограничи го износот на содржински елементи кои треба да се овозможат од овој извор. Забелешка: Можен е избор на само еден содржински вид, кога опцијата е избрана."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Предодредената фреквентност со која овие содржински видови е многу веројатно да се променат."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Сите"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Било кој содржински вид"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Креирај нова содржина"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Избери ако сакаш содржинскиот елемент да биде објавен при процесот на креирање. Оставете празно, ако сакате да креирате нацрт верзија."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Избриши содржина користејќи го изразот: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Откажи"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Погледни нацрт како JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Симни нацрт како JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Погледни објавени како JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Симни објавени како JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Погледни како JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Откажи"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Не се најдени експортирани содржини кон планот за распоредување. Создадете план за распоредување и додадете чекор за експорт на содржини кон цел за распоредување."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Содржина"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Нов/а"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Објави содржина користејќи го изразот: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Повлечи содржина користејќи го изразот: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Отповикај објава на содржина користејќи го изразот: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Ажурирај содржина користејќи го изразот: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Внеси JavaScript израз за евалуација на идентификаторот на содржински елемент (ContentItemId) за кој би бил ажуриран. На пример: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/mk/OrchardCore.CustomSettings.po b/Localization/mk/OrchardCore.CustomSettings.po
index 8fabc05850632..244464a11cbef 100644
--- a/Localization/mk/OrchardCore.CustomSettings.po
+++ b/Localization/mk/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Прилагодени подесувања"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Сите"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/mk/OrchardCore.Data.YesSql.po b/Localization/mk/OrchardCore.Data.YesSql.po
index 12face8a98879..04fb1af6bc908 100644
--- a/Localization/mk/OrchardCore.Data.YesSql.po
+++ b/Localization/mk/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/mk/OrchardCore.Demo.po b/Localization/mk/OrchardCore.Demo.po
index 4fa64c92aec18..ee9c0ce4e52dc 100644
--- a/Localization/mk/OrchardCore.Demo.po
+++ b/Localization/mk/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Име"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Презиме"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/mk/OrchardCore.Deployment.Remote.po b/Localization/mk/OrchardCore.Deployment.Remote.po
index afc9f20babe5e..bfc99b684e85f 100644
--- a/Localization/mk/OrchardCore.Deployment.Remote.po
+++ b/Localization/mk/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Го праќа планот за распоредување кон оддалечената инстанца."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Име на клиент"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Креирај оддалечена инстанца"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Име на клиент"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Измени оддалечен клиент"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Име на клиент"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Измени оддалечена инстанца"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Име на клиент"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/mk/OrchardCore.Deployment.po b/Localization/mk/OrchardCore.Deployment.po
index 55b6aca9a623b..795772adf5c68 100644
--- a/Localization/mk/OrchardCore.Deployment.po
+++ b/Localization/mk/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON импорт"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Избриши"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Името е задолжително."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "План за распоредување со исто име веќе постои."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Креирај план за распоредување"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Прилагодена датотека која треба да се додаде како дел од планот."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Име на датотека како што треба да се додаде во архивата."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Планови за распоредување"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Сите"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Измени план за распоредување"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Датотека на рецептот кој треба да се додаде како дел од планот."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Името на рецептот."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Име за приказ на рецептот."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Опис на рецептот."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Автор на рецептот."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Рецепт на веб сајтот."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Верзија на рецептот."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Категории на рецептот (листа одделена со запирка)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/mk/OrchardCore.Diagnostics.po b/Localization/mk/OrchardCore.Diagnostics.po
index c35ca99eb4ae2..71de273fc8b07 100644
--- a/Localization/mk/OrchardCore.Diagnostics.po
+++ b/Localization/mk/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Вашиот пребарувач испрати барање кое серверот не го разбира."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Грешка при извршување на барањето."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Немате пристап до овој ресурс."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Страницата не може да се пронајде."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Не сте авторизирани да ја видите оваа содржина."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/mk/OrchardCore.Email.Abstractions.po b/Localization/mk/OrchardCore.Email.Abstractions.po
index 72980291f80bf..979f30fbea103 100644
--- a/Localization/mk/OrchardCore.Email.Abstractions.po
+++ b/Localization/mk/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Полето {0} е задолжително."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Методот на достава '{0}' не е поддржан."
diff --git a/Localization/mk/OrchardCore.Email.po b/Localization/mk/OrchardCore.Email.po
index 833ee76f67b3a..b1bef64bbe8ca 100644
--- a/Localization/mk/OrchardCore.Email.po
+++ b/Localization/mk/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Задача за е-пошта"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Пораки"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Неуспешно"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Испрати е-пошта"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "Адресата за е-пошта на авторот дефинира од кого доаѓа е-поштата. Оставете празно за да се користи конфигураната адреса на е-пошта. Со поддршка за „Liquid“."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Адресата за е-пошта на испраќачот. Задолжително ако не е иста како наведената во полето „Од“. Со поддршка за „Liquid“."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Одговор на е-пошта. Задолжително ако сакате одговорите на е-пошта да бидат пратени на друга адреса од таа наведена во полето „Од\". Со поддршка за Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Листата адреси на приматели на е-пошта одделена со запирка. Со поддршка за „Liquid“."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Подесувања"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "До"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Испраќачот е опционален, но е корисен кога авторот на е-поштата е различен од поднесувачот на е-поштата."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Bcc адреса"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Cc адреса"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Одговори на"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Наслов"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Главен текст"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Тековниот „потстанар“ ќе биде повторно вчитан, кога ќе бидат сочувани подесувањата."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Предодредената адреса на е-пошта која би се користела за испраќање, доколку истата не е поставена."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Опции за мрежна достава"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Доменот на SMTP серверот н.п. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Порта на SMTP сервер, најчесто 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Кога е избрана оваа опција, „application pool“ или идентитетот на хост-процесот ќе биде користен за автентикација со серверот за е-пошта."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Корисничко име за автентикација."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Опции за достава на дефинираната папка за достава"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Н.п. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> за да ги поставите пораките во <i>PickedUpEmail</i> папка на дискот Ц."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/mk/OrchardCore.Facebook.po b/Localization/mk/OrchardCore.Facebook.po
index 650932c1a67a5..9f770b655e705 100644
--- a/Localization/mk/OrchardCore.Facebook.po
+++ b/Localization/mk/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Главниот текст на Фејсбук не содржи валиден „Liquid“ израз. Детали: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Главниот текст не содржи валиден „Liquid“ израз. Детали: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Подесувања на логин"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Повиканата патека која е дел од апликациската основна патека, каде корисничкиот агент ќе биде вратен. „Middleware“ софтвер ќе го процесира побарувањето кога ќе пристигне."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Шаблон на плагинот, во „Liquid“ формат."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "„SDK“ јаваскрипт верзија"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Иницијализација на секоја страница"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/mk/OrchardCore.Features.po b/Localization/mk/OrchardCore.Features.po
index 41a8dc379888b..e53b52d4b8b2b 100644
--- a/Localization/mk/OrchardCore.Features.po
+++ b/Localization/mk/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Функционалности"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Ве молиме изберете една или повеќе функционалности."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Масовни акции"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Оневозможи"
@@ -136,8 +136,8 @@ msgstr "Оневозможи"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Овозможи"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Некатегоризирани"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Оневозможување на функционалноста {0}, ќе ги оневозможи поврзаните функционалности: {1}. Дали да се продолжи?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Оневозможи функционалност"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Да"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Не"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Празно</strong>Вашето пребарување не врати резултати."
diff --git a/Localization/mk/OrchardCore.Flows.po b/Localization/mk/OrchardCore.Flows.po
index 55cc0313bbdcd..e685c3e2dc250 100644
--- a/Localization/mk/OrchardCore.Flows.po
+++ b/Localization/mk/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Додадете елемент"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Содржински видови кои овој „BagPart“ може да ги содржи н.п. слајд како дел од слајд шоу."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Внеси додаток"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Избриши"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Дали сте сигурни дека сакате да го отстраните овој елемент?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/mk/OrchardCore.Forms.po b/Localization/mk/OrchardCore.Forms.po
index e7ed5717e229b..d9459498dc60a 100644
--- a/Localization/mk/OrchardCore.Forms.po
+++ b/Localization/mk/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Задача за додавање валидација при грешка на модел"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Валидација"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Задача за поврзување на состојба на модел"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Валидација"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Задача за валидација на токен против фалсификување"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Валидација"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Валидно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Невалидно"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Задача за валидација на поле од форма"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Валидација"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Валидно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Невалидно"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Задача за валидација на форма"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Валидација"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Валидно"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Невалидно"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Име на полето од формата кое има невалидна вредност."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Поврзува поднесени полиња на форма со состојба на модел."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Текстот кој треба да се прикаже на копчето."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Видот на копчето."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "Идентификаторот кој треба да се прикаже на овој елемент од формата."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Името кој треба да се прикаже на овој елемент од формата."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "URL адресата каде да се поднесе формата."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "HTTP метода која ќе се користи при поднесување на формата."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Избери за генерирање на токен против фалсификат во формата."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Видот на копчето."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Текст за приказ кога полето нема вредност."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Предодредената вредност за ова поле."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Текст за приказ кога полето за текст нема вредност."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Валидирај <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Името на полето од форма кое треба да се валидира."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Проверува дали поднесената форма содржи грешки при валидација."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/mk/OrchardCore.GitHub.po b/Localization/mk/OrchardCore.GitHub.po
index 1754ebe5300ba..df9bb86da8667 100644
--- a/Localization/mk/OrchardCore.GitHub.po
+++ b/Localization/mk/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Подесувања за автентификација на GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Client ID дефиниран на генералниот таб на вашата <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Тајната за вашата апликација."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/mk/OrchardCore.Google.po b/Localization/mk/OrchardCore.Google.po
index fe7c457b7774b..d4507263c3687 100644
--- a/Localization/mk/OrchardCore.Google.po
+++ b/Localization/mk/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Подесувања на Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Подесувања за автентификација на Google"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "„client id“ дефиниран во „Google API“ делот за соодветната апликација."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "„client secret“ дефиниран во „Google API“ делот за соодветната апликација."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/mk/OrchardCore.Html.po b/Localization/mk/OrchardCore.Html.po
index aa6cf19784328..02cf71ad7b711 100644
--- a/Localization/mk/OrchardCore.Html.po
+++ b/Localization/mk/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Едитор базиран на „Wysiwyg“ принципот"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Телото на содржинскиот елемент."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Внесете опции на едитор"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документација на опциите"
diff --git a/Localization/mk/OrchardCore.Https.po b/Localization/mk/OrchardCore.Https.po
index 0180ed6f05c60..99eb5e311e055 100644
--- a/Localization/mk/OrchardCore.Https.po
+++ b/Localization/mk/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Покажува, дали статус за постојано пренасочено „308 Moved Permanently“, треба да биде користен, наместо статус на привремено пренасочено „307 Found“, кога се пренасочува кон HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/mk/OrchardCore.Infrastructure.Abstractions.po b/Localization/mk/OrchardCore.Infrastructure.Abstractions.po
index 3180be6fe2c00..2467d80493347 100644
--- a/Localization/mk/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/mk/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/mk/OrchardCore.Layers.po b/Localization/mk/OrchardCore.Layers.po
index 3c91fe9d98dcd..36f1b868a6d10 100644
--- a/Localization/mk/OrchardCore.Layers.po
+++ b/Localization/mk/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Додади слој"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Опис"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Измени слој - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Измени додатоци и слоеви"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Додатокот е успешно преместен <a href=\"javascript:console.log('submit');$('#undo-form').submit();\">Врати</strong>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Зони"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Ве молиме <a href=\"{0}\"> дефинирајте ги достапните зони</a> пред да додадете додаток"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Додади Додаток"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Слоеви"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Изберете слој да ги прикажете поврзаните додатоци."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Измени"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Избриши"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Ве молиме <a href=\"{0}\"> додадете слој</a> пред да додадете додаток"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Додади"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Ако е избрано, насловот ќе биде прикажан заедно со додатокот."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Слојот со кој треба да се поврзе додатокот."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/mk/OrchardCore.Liquid.po b/Localization/mk/OrchardCore.Liquid.po
index 555ddf569331e..40c85567df25e 100644
--- a/Localization/mk/OrchardCore.Liquid.po
+++ b/Localization/mk/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/mk/OrchardCore.Lists.po b/Localization/mk/OrchardCore.Lists.po
index 701321cbb37c4..c3b7b029e9bc6 100644
--- a/Localization/mk/OrchardCore.Lists.po
+++ b/Localization/mk/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Преставува врска кон родителскиот содржински елемент и редоследот по кој тој содржински елемент е претставен."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Претставува збир на содржински елементи."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Соодветниот пост на блогот веќе не постои. Ве молиме креирајте нов пост на блогот."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Не сте овластени да ја избришете оваа содржина"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Поднесените корисничкото име, е-пошта или лозинка не се точни."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Листата е празна"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Избери ја оваа опција за да се овозможи мануелно подредување на елементи."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Листи"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Додади родителски елемент на мени"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/mk/OrchardCore.Localization.po b/Localization/mk/OrchardCore.Localization.po
index e94d3db4354e6..50fb9a63bf56a 100644
--- a/Localization/mk/OrchardCore.Localization.po
+++ b/Localization/mk/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Култури"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Избор на култура е задолжителен"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Листа на активните култури кои се подесени за овој сајт."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Додади култура"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/mk/OrchardCore.Markdown.po b/Localization/mk/OrchardCore.Markdown.po
index 9dff190c12d19..ae9038f5bc3ac 100644
--- a/Localization/mk/OrchardCore.Markdown.po
+++ b/Localization/mk/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Едитор базиран на „Wysiwyg“ принципот"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Главниот текст на содржинскиот елемент, во „Маркдаун“ формат."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Едитор базиран на „Wysiwyg“ принципот"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/mk/OrchardCore.Media.po b/Localization/mk/OrchardCore.Media.po
index 8c19cddc12a6f..f3bb82c98dcf5 100644
--- a/Localization/mk/OrchardCore.Media.po
+++ b/Localization/mk/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/mk/OrchardCore.Menu.po b/Localization/mk/OrchardCore.Menu.po
index f59a5774decad..4df696cb137db 100644
--- a/Localization/mk/OrchardCore.Menu.po
+++ b/Localization/mk/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Менија"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Измени {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Име"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/mk/OrchardCore.Microsoft.Authentication.po b/Localization/mk/OrchardCore.Microsoft.Authentication.po
index 0daee1b4bcd62..cb6f8e0eab53d 100644
--- a/Localization/mk/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/mk/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Подесувања на Микрософт акаунт за автентикација"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "„Application ID“ поставен во параметрите на Микрософт порталот за развивачи на софтвер."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "„Application secret key“ поставен во параметрите на Микрософт порталот за развивачи на софтвер."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/mk/OrchardCore.Navigation.po b/Localization/mk/OrchardCore.Navigation.po
index 8c09fb17ea936..a3b354bb7d7f1 100644
--- a/Localization/mk/OrchardCore.Navigation.po
+++ b/Localization/mk/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/mk/OrchardCore.Notifications.po b/Localization/mk/OrchardCore.Notifications.po
index 9ed33ae546f75..6079180fd852f 100644
--- a/Localization/mk/OrchardCore.Notifications.po
+++ b/Localization/mk/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/mk/OrchardCore.OpenId.po b/Localization/mk/OrchardCore.OpenId.po
index 1f0cc6becc0c2..0293da5080fda 100644
--- a/Localization/mk/OrchardCore.OpenId.po
+++ b/Localization/mk/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/mk/OrchardCore.Placements.po b/Localization/mk/OrchardCore.Placements.po
index a063fe9200b18..7a3336278e3ba 100644
--- a/Localization/mk/OrchardCore.Placements.po
+++ b/Localization/mk/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/mk/OrchardCore.ProjectTemplates.po b/Localization/mk/OrchardCore.ProjectTemplates.po
index 514dfaed48c16..60c34361b53f2 100644
--- a/Localization/mk/OrchardCore.ProjectTemplates.po
+++ b/Localization/mk/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 20:29\n"
+"PO-Revision-Date: 2023-12-22 16:32\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Прикажи"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/mk/OrchardCore.PublishLater.po b/Localization/mk/OrchardCore.PublishLater.po
index 70ba1c264db0f..61abece744ebf 100644
--- a/Localization/mk/OrchardCore.PublishLater.po
+++ b/Localization/mk/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Објави подоцна"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Откажи подоцнежна објава"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/mk/OrchardCore.Queries.po b/Localization/mk/OrchardCore.Queries.po
index 269130e0d9523..cdb82c0aae385 100644
--- a/Localization/mk/OrchardCore.Queries.po
+++ b/Localization/mk/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/mk/OrchardCore.ReCaptcha.Core.po b/Localization/mk/OrchardCore.ReCaptcha.Core.po
index b8b3cd8fe471d..55bc5982ae9d7 100644
--- a/Localization/mk/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/mk/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Валидација на „captcha“ не беше успешна"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Валидација на „captcha“ не беше успешна"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Јазик со име {0} не беше најден"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/mk/OrchardCore.ReCaptcha.po b/Localization/mk/OrchardCore.ReCaptcha.po
index 3430045d31f55..540f2b3e5d1ea 100644
--- a/Localization/mk/OrchardCore.ReCaptcha.po
+++ b/Localization/mk/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Експорт на подесувања на ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Валидирајте акција на „ReCaptcha“"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Валидација"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Валидно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Невалидно"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Валидацијата на „Captcha“ беше неуспешна. Обидете се повторно."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Тековниот „потстанар“ ќе биде повторно вчитан, кога ќе бидат сочувани подесувањата."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Вашиот „Google's reCaptcha“ клуч на сајтот."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/mk/OrchardCore.Recipes.Core.po b/Localization/mk/OrchardCore.Recipes.Core.po
index 4312028157936..f3daf3d1ba9ba 100644
--- a/Localization/mk/OrchardCore.Recipes.Core.po
+++ b/Localization/mk/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/mk/OrchardCore.Roles.po b/Localization/mk/OrchardCore.Roles.po
index cd9b8ba02affd..e60eb935e852b 100644
--- a/Localization/mk/OrchardCore.Roles.po
+++ b/Localization/mk/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Улоги"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Невалидно има на улога."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Улогата е успешно ажурирана."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Не може да избришат системски улоги."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Креирај улога"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Име на улога"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Измени детали на улогата"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Дозвола"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Дозволата може да дозволи корисник да добие други повисоки дозволи. Дозволете, само со големо внимание."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Откажи"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Улоги"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/mk/OrchardCore.Rules.po b/Localization/mk/OrchardCore.Rules.po
index 0a80e8247320d..5d8894e912a52 100644
--- a/Localization/mk/OrchardCore.Rules.po
+++ b/Localization/mk/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/mk/OrchardCore.Search.Elasticsearch.po b/Localization/mk/OrchardCore.Search.Elasticsearch.po
index 3a79dbe1a0ea1..0e39659a9280c 100644
--- a/Localization/mk/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/mk/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/mk/OrchardCore.Search.Lucene.po b/Localization/mk/OrchardCore.Search.Lucene.po
index 9a1a8f7609a66..758c6d05b1576 100644
--- a/Localization/mk/OrchardCore.Search.Lucene.po
+++ b/Localization/mk/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/mk/OrchardCore.Search.po b/Localization/mk/OrchardCore.Search.po
index 88ee4e0bd1c69..71dc105ce8a4e 100644
--- a/Localization/mk/OrchardCore.Search.po
+++ b/Localization/mk/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/mk/OrchardCore.Security.po b/Localization/mk/OrchardCore.Security.po
index 15d64d3ee4c0e..fbd8446a43756 100644
--- a/Localization/mk/OrchardCore.Security.po
+++ b/Localization/mk/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/mk/OrchardCore.Seo.po b/Localization/mk/OrchardCore.Seo.po
index b392025cfd9dc..b3f10e7effe86 100644
--- a/Localization/mk/OrchardCore.Seo.po
+++ b/Localization/mk/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/mk/OrchardCore.Settings.po b/Localization/mk/OrchardCore.Settings.po
index 586599f4f1c27..c54ab678263a2 100644
--- a/Localization/mk/OrchardCore.Settings.po
+++ b/Localization/mk/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Подесувањата на сајтот се актуелизирани успешно."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Основната URL адреса мора да е целосно дефинирана URL."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Подесувања на сајтот"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/mk/OrchardCore.Setup.Core.po b/Localization/mk/OrchardCore.Setup.Core.po
index 855d547725163..424f2a24ae4f3 100644
--- a/Localization/mk/OrchardCore.Setup.Core.po
+++ b/Localization/mk/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/mk/OrchardCore.Setup.po b/Localization/mk/OrchardCore.Setup.po
index e02faa92a3b21..9a897d30c1553 100644
--- a/Localization/mk/OrchardCore.Setup.po
+++ b/Localization/mk/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Лозинката мора да има нај малку {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Не е возможно да се постави сајт без рецепт."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Ова се користи како предодреден наслов на твоите страници."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Рецепти дозволуваат да го поставите вашиот сајт со дополнителни однапред конфигурирани опции, функционалности и подесувања уште на почетокот."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Ја утврдува предодредената временска зона која се користи при приказ или измена на датуми и времиња."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Базата на податоци се користи за зачувување на конфигурација и содржините на сајтот."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Може да дефинирате префикс за табелите, ако планирате да ја користите истата база на податоци за повеќе сајтови."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Прикажи/Сокриј стинг за поврзување"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Супер корисникот ги има сите права. Треба да се користи само при поставување на сајтот или при обновување на сајтот при катастрофа."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Корисничко име"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Внесената адреса за е-пошта е невалидна."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Јачина на лозинката"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/mk/OrchardCore.Shortcodes.po b/Localization/mk/OrchardCore.Shortcodes.po
index 650dcafb6b0d1..a3fccaab206dd 100644
--- a/Localization/mk/OrchardCore.Shortcodes.po
+++ b/Localization/mk/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/mk/OrchardCore.Sitemaps.po b/Localization/mk/OrchardCore.Sitemaps.po
index edbefcb30b874..2c955b4368f2b 100644
--- a/Localization/mk/OrchardCore.Sitemaps.po
+++ b/Localization/mk/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/mk/OrchardCore.Sms.po b/Localization/mk/OrchardCore.Sms.po
index 88b5c25cf4cdc..abec089621ac7 100644
--- a/Localization/mk/OrchardCore.Sms.po
+++ b/Localization/mk/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/mk/OrchardCore.Spatial.po b/Localization/mk/OrchardCore.Spatial.po
index 9c9a126ba2857..ac3fff43efdf2 100644
--- a/Localization/mk/OrchardCore.Spatial.po
+++ b/Localization/mk/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/mk/OrchardCore.Taxonomies.po b/Localization/mk/OrchardCore.Taxonomies.po
index 5e523a344a4b7..2ab6017c10ebc 100644
--- a/Localization/mk/OrchardCore.Taxonomies.po
+++ b/Localization/mk/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Вредност е задолжителна за '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Тагови"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Таксономијата не може да се најде. Ве молиме проверете ги подесувањата на ова поле."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Грешка при креирање на таг"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Внесете за пребарување"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Избери"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Отстрани"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Притиснете „ентер“ за да креирате таг"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Не се најдени тагови"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Тагови"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Стандардно"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Таксономијата не може да се најде. Ве молиме проверете ги подесувањата на ова поле."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Стандардно"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текстот за помош кој би бил прикажан за ова поле."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Таксономија"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Задолжително"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Дали барем еден елемент е избран."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Уникатно"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Дали само еден елемент може да е избран."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Само „листови“"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Дали „листови“ се единствените елементи кои може да бидат избрани."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Дали нови тагови може да се креираат на средина текст („inline“). Забелешка: Кога се креираат тагови на средина на текст, само прикажаниот израз во текстот ќе биде поставен."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Содржински вид „Израз“"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Додади {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Ја прередивте таксономијата."
diff --git a/Localization/mk/OrchardCore.Templates.Cms.Module.po b/Localization/mk/OrchardCore.Templates.Cms.Module.po
index 948c8b73783fb..e6e1f8cd77f4a 100644
--- a/Localization/mk/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/mk/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Прикажи"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/mk/OrchardCore.Templates.po b/Localization/mk/OrchardCore.Templates.po
index 2179df0af69a7..d4a9061a254a6 100644
--- a/Localization/mk/OrchardCore.Templates.po
+++ b/Localization/mk/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Шаблонот \"{0}\" е креиран."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Преглед"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Името на шаблонот."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Опис на шаблонот."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Преглед"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Името на шаблонот."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Опис на шаблонот."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/mk/OrchardCore.Tenants.po b/Localization/mk/OrchardCore.Tenants.po
index c0d12209d5c88..ec118a470527c 100644
--- a/Localization/mk/OrchardCore.Tenants.po
+++ b/Localization/mk/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/mk/OrchardCore.Tests.po b/Localization/mk/OrchardCore.Tests.po
index 910081265fa69..23d46d4bea253 100644
--- a/Localization/mk/OrchardCore.Tests.po
+++ b/Localization/mk/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/mk/OrchardCore.Themes.po b/Localization/mk/OrchardCore.Themes.po
index 7f01bd7ce1933..d160ffbd35e64 100644
--- a/Localization/mk/OrchardCore.Themes.po
+++ b/Localization/mk/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Ја експортира актуелната тема на сајтот и на админ. тема."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/mk/OrchardCore.Title.po b/Localization/mk/OrchardCore.Title.po
index f4d7dc625d1fc..c98d899313c4f 100644
--- a/Localization/mk/OrchardCore.Title.po
+++ b/Localization/mk/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шемата не содржи валиден „Liquid“ израз. Детали: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Стандард"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Стандард"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Означи за приказ на насловот во прегледи на екранот."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/mk/OrchardCore.Twitter.po b/Localization/mk/OrchardCore.Twitter.po
index 94cae627b4a2e..243b8ad6642a5 100644
--- a/Localization/mk/OrchardCore.Twitter.po
+++ b/Localization/mk/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Токенот за тајна на пристап е задолжителен"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Ажурирање на статусот на Твитер акција"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Социјално"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Завршено"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Неуспешно"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr "Твитер"
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Тековниот „потстанар“ ќе биде повторно вчитан, кога ќе бидат сочувани подесувањата."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Подесувања за Твитер интеграција"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API клуч"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "API клучот дефиниран во табот „Клучови и токени“ кој е дел од таблата на Твитер апликацијата."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Таен клуч за API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Тајниот клуч за API дефиниран во табот „Клучови и токени“ кој е дел од таблата на Твитер апликацијата."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Токен за пристап"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Токенот за пристап дефиниран во табот „Клучови и токени“ кој е дел од таблата на Твитер апликацијата."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Тајна на токенот за пристап"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Тајната за токенот за пристап дефиниран во табот „Клучови и токени“ кој е дел од таблата на Твитер апликацијата."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Најава со подесувања од Твитер"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Ажурирање на Твитер статус"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/mk/OrchardCore.Users.Core.po b/Localization/mk/OrchardCore.Users.Core.po
index 2cc6ba9a20d4d..c030e1c69fca3 100644
--- a/Localization/mk/OrchardCore.Users.Core.po
+++ b/Localization/mk/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Е-поштата '{0}' не е валидна."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Неочекувана грешка: '{0}'."
diff --git a/Localization/mk/OrchardCore.Users.po b/Localization/mk/OrchardCore.Users.po
index ed5c6095072e1..e502b8f532c64 100644
--- a/Localization/mk/OrchardCore.Users.po
+++ b/Localization/mk/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/mk/OrchardCore.Widgets.po b/Localization/mk/OrchardCore.Widgets.po
index c3c0a6a1ff450..bf171f4361c15 100644
--- a/Localization/mk/OrchardCore.Widgets.po
+++ b/Localization/mk/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Додади Додаток"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/mk/OrchardCore.Workflows.po b/Localization/mk/OrchardCore.Workflows.po
index 99ba21012787a..ca6309479724e 100644
--- a/Localization/mk/OrchardCore.Workflows.po
+++ b/Localization/mk/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Филтер"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/mk/TheAdmin.po b/Localization/mk/TheAdmin.po
index 3e170510014c3..41afba211162e 100644
--- a/Localization/mk/TheAdmin.po
+++ b/Localization/mk/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Намали / прошири го менито"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Избриши"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Дали сте сигурни дека сакате да го отстраните овој елемент?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Во ред"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Откажи"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/mk/TheAgencyTheme.po b/Localization/mk/TheAgencyTheme.po
index 03747534590cd..e48f8c55c7350 100644
--- a/Localization/mk/TheAgencyTheme.po
+++ b/Localization/mk/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Не се пронајдени такви резултати."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Страницата која ја побаравте не може да биде пронајдена."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/mk/TheBlogTheme.po b/Localization/mk/TheBlogTheme.po
index 57c27fc1376f1..abef5d4af520d 100644
--- a/Localization/mk/TheBlogTheme.po
+++ b/Localization/mk/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "на {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Не се пронајдени такви резултати."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Страницата не е пронајдена"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/mk/TheTheme.po b/Localization/mk/TheTheme.po
index 12d9931f3f24f..4ee8265e08900 100644
--- a/Localization/mk/TheTheme.po
+++ b/Localization/mk/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Macedonian\n"
 "Language: mk_MK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/nb-NO/OrchardCore.Admin.po b/Localization/nb-NO/OrchardCore.Admin.po
index 067f40cdf4ca6..b9c9512b59e25 100644
--- a/Localization/nb-NO/OrchardCore.Admin.po
+++ b/Localization/nb-NO/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Admin innstillinger"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Eksporterer admin innstillingene."
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Utforsk menyen og oppdag alle mulighetene."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/nb-NO/OrchardCore.AdminDashboard.po b/Localization/nb-NO/OrchardCore.AdminDashboard.po
index e74b99265cce8..8a18de9d144ab 100644
--- a/Localization/nb-NO/OrchardCore.AdminDashboard.po
+++ b/Localization/nb-NO/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/nb-NO/OrchardCore.AdminMenu.po b/Localization/nb-NO/OrchardCore.AdminMenu.po
index 8fa1e487ff0fd..72e7b7ce833c8 100644
--- a/Localization/nb-NO/OrchardCore.AdminMenu.po
+++ b/Localization/nb-NO/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Legg til admin meny {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Navn"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Opprett node"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Rediger admin meny: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Navn"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Rediger node"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Prioriteten til denne lenken for visning som aktiv overfor en annen når begge peker til samme nettadresse. Linken med høyeste verdi får aktiv status i navigeringen."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Posisjonsrankering til denne lenken i admin menyen."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Lenke"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Lenketeksten slik den vil vises i treet."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Url til lenken. En lenke vises kun hvis den en av dennes barn har en url. Den vil være relativ til roten av adminsiden"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Velg et ikon"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Plassholder"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Teksten til menypunktet slik den vil bli vist i treet."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Velg"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Velg et ikon for visning når elementet er på topp nivå."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Velg et ikon"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.Alias.po b/Localization/nb-NO/OrchardCore.Alias.po
index 452686b3fe3fd..482b4979f2bca 100644
--- a/Localization/nb-NO/OrchardCore.Alias.po
+++ b/Localization/nb-NO/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mønsteret inneholder ingen gyldig Liquid uttrykk. Detaljer: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "La det være blank for å re-generere det."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias er generert og redigering er deaktivert"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nb-NO/OrchardCore.ArchiveLater.po b/Localization/nb-NO/OrchardCore.ArchiveLater.po
index 99cb1865481eb..dc3efe6b4480f 100644
--- a/Localization/nb-NO/OrchardCore.ArchiveLater.po
+++ b/Localization/nb-NO/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2022-10-11 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/nb-NO/OrchardCore.AuditTrail.po b/Localization/nb-NO/OrchardCore.AuditTrail.po
index 72512e5639a57..8b56084021bd5 100644
--- a/Localization/nb-NO/OrchardCore.AuditTrail.po
+++ b/Localization/nb-NO/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/nb-NO/OrchardCore.Autoroute.po b/Localization/nb-NO/OrchardCore.Autoroute.po
index bbfc20d214fd3..9f0bc2e7f75cd 100644
--- a/Localization/nb-NO/OrchardCore.Autoroute.po
+++ b/Localization/nb-NO/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nb-NO/OrchardCore.BackgroundTasks.po b/Localization/nb-NO/OrchardCore.BackgroundTasks.po
index 0505563f3eda2..35d045c4176d2 100644
--- a/Localization/nb-NO/OrchardCore.BackgroundTasks.po
+++ b/Localization/nb-NO/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/nb-NO/OrchardCore.ContentFields.po b/Localization/nb-NO/OrchardCore.ContentFields.po
index 9b99ead01574d..7c533893cbb7b 100644
--- a/Localization/nb-NO/OrchardCore.ContentFields.po
+++ b/Localization/nb-NO/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.ContentLocalization.po b/Localization/nb-NO/OrchardCore.ContentLocalization.po
index b56de6d91fcd1..efe4d2c4c1f8f 100644
--- a/Localization/nb-NO/OrchardCore.ContentLocalization.po
+++ b/Localization/nb-NO/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/nb-NO/OrchardCore.ContentPreview.po b/Localization/nb-NO/OrchardCore.ContentPreview.po
index e377bec9e7f12..d145800b10c91 100644
--- a/Localization/nb-NO/OrchardCore.ContentPreview.po
+++ b/Localization/nb-NO/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mønsteret inneholder ingen gyldig Liquid uttrykk. Detaljer: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Forhåndsvis"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Forhåndsvisning frakoblet"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Feil med forhåndsvisning"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nb-NO/OrchardCore.ContentTypes.po b/Localization/nb-NO/OrchardCore.ContentTypes.po
index c29d530bf641e..078e50abcc4f8 100644
--- a/Localization/nb-NO/OrchardCore.ContentTypes.po
+++ b/Localization/nb-NO/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.Contents.po b/Localization/nb-NO/OrchardCore.Contents.po
index db2be97626a35..5f7ef9d4ce1f1 100644
--- a/Localization/nb-NO/OrchardCore.Contents.po
+++ b/Localization/nb-NO/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/nb-NO/OrchardCore.CustomSettings.po b/Localization/nb-NO/OrchardCore.CustomSettings.po
index 7de9198d59ec9..1045327dcfba8 100644
--- a/Localization/nb-NO/OrchardCore.CustomSettings.po
+++ b/Localization/nb-NO/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Egendefinerte innstillinger"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/nb-NO/OrchardCore.Data.YesSql.po b/Localization/nb-NO/OrchardCore.Data.YesSql.po
index 9f0bce0d264c0..e69e1f4a78cb2 100644
--- a/Localization/nb-NO/OrchardCore.Data.YesSql.po
+++ b/Localization/nb-NO/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.Demo.po b/Localization/nb-NO/OrchardCore.Demo.po
index 8a568db9a78fb..e647696a06117 100644
--- a/Localization/nb-NO/OrchardCore.Demo.po
+++ b/Localization/nb-NO/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Fornavn"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Etternavn"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/nb-NO/OrchardCore.Deployment.Remote.po b/Localization/nb-NO/OrchardCore.Deployment.Remote.po
index 22252689a0587..8773235b2a95d 100644
--- a/Localization/nb-NO/OrchardCore.Deployment.Remote.po
+++ b/Localization/nb-NO/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Sender opprettings planen til fjern-instansen."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Klientnavn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Opprett Fjern-instans"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Navn"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Klientnavn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Rediger Fjern-klient"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Klientnavn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Opprett Fjern-instans"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Navn"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Klientnavn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/nb-NO/OrchardCore.Deployment.po b/Localization/nb-NO/OrchardCore.Deployment.po
index 5eb0690ca810c..fc5e846f1443e 100644
--- a/Localization/nb-NO/OrchardCore.Deployment.po
+++ b/Localization/nb-NO/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/nb-NO/OrchardCore.Diagnostics.po b/Localization/nb-NO/OrchardCore.Diagnostics.po
index 7b29e785c4f49..3fbf6f27c1e47 100644
--- a/Localization/nb-NO/OrchardCore.Diagnostics.po
+++ b/Localization/nb-NO/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Nettleseren din sendte en forespørsel som serveren ikke kunne forstå."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "En feil oppstod ved kjøring av forespørselen."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Du har ikke tilgang til denne ressursen."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Siden ble ikke funnet."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Du har ikke tilgang til å se dette innholdet."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/nb-NO/OrchardCore.Email.Abstractions.po b/Localization/nb-NO/OrchardCore.Email.Abstractions.po
index b4acc74843215..4923b3aa7d5cf 100644
--- a/Localization/nb-NO/OrchardCore.Email.Abstractions.po
+++ b/Localization/nb-NO/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Feltet {0} er påkrevd."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Leveringsmetoden '{0}' er ikke støttet."
diff --git a/Localization/nb-NO/OrchardCore.Email.po b/Localization/nb-NO/OrchardCore.Email.po
index fccc73daa9dc7..4ea3ac0cd16cd 100644
--- a/Localization/nb-NO/OrchardCore.Email.po
+++ b/Localization/nb-NO/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/nb-NO/OrchardCore.Facebook.po b/Localization/nb-NO/OrchardCore.Facebook.po
index 23a93da284ff3..2e78f5fd95a56 100644
--- a/Localization/nb-NO/OrchardCore.Facebook.po
+++ b/Localization/nb-NO/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "FaceBook hovedinneholdet har ingen gyldig Liquid uttrykk. Detaljer: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/nb-NO/OrchardCore.Features.po b/Localization/nb-NO/OrchardCore.Features.po
index 7cba25207bb9b..c0ed5a4468f3f 100644
--- a/Localization/nb-NO/OrchardCore.Features.po
+++ b/Localization/nb-NO/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funksjoner"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Velg en eller flere funksjoner."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Massehandlinger"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Deaktiver"
@@ -136,8 +136,8 @@ msgstr "Deaktiver"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Aktiver"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Ukategorisert"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Deaktivering av {0} funksjonen vil også deaktivere følgende avhengige funksjoner: {1} Fortsette?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Deaktiver funksjon"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Ja"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Nei"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Ingenting her!</strong> Ditt søk ga ingen resultater."
diff --git a/Localization/nb-NO/OrchardCore.Flows.po b/Localization/nb-NO/OrchardCore.Flows.po
index 9eda80604ac5e..d11fb464c5097 100644
--- a/Localization/nb-NO/OrchardCore.Flows.po
+++ b/Localization/nb-NO/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Legg til element"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Innholdstypene som denne posen kan inneholde, f.eks Slide for en Slide Visning."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Sett inn dings"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Slette"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Er du sikker du vil slette dette elementet?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/nb-NO/OrchardCore.Forms.po b/Localization/nb-NO/OrchardCore.Forms.po
index 590b4c40491b9..406714812e779 100644
--- a/Localization/nb-NO/OrchardCore.Forms.po
+++ b/Localization/nb-NO/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/nb-NO/OrchardCore.GitHub.po b/Localization/nb-NO/OrchardCore.GitHub.po
index 357e58945119d..b92bb34703439 100644
--- a/Localization/nb-NO/OrchardCore.GitHub.po
+++ b/Localization/nb-NO/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "GitHub autentiseringsinnstillinger"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "ClientID fra 'General' fanen i din <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "'Secret' for din app."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/nb-NO/OrchardCore.Google.po b/Localization/nb-NO/OrchardCore.Google.po
index 9a29d2250d3e7..64f4062633886 100644
--- a/Localization/nb-NO/OrchardCore.Google.po
+++ b/Localization/nb-NO/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Google Analytics Innstillinger"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Google Authentication innstillinger"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Client ID fra Google API kontroll panelet for applikasjonen."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Client secret fra Google API kontroll panelet for applikasjonen."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/nb-NO/OrchardCore.Html.po b/Localization/nb-NO/OrchardCore.Html.po
index f0021598d1d4c..36c20894c9a25 100644
--- a/Localization/nb-NO/OrchardCore.Html.po
+++ b/Localization/nb-NO/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Hoveddelen av innholdselementet."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Angi alternativene for editoren"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentasjon for alternativer"
diff --git a/Localization/nb-NO/OrchardCore.Https.po b/Localization/nb-NO/OrchardCore.Https.po
index 0156e5ceca533..3a3f965d6297e 100644
--- a/Localization/nb-NO/OrchardCore.Https.po
+++ b/Localization/nb-NO/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Angir om en permanent henvisning, '308 Moved Permanently', skal brukes i stedet for en midlertidig henvisning, '307 Found' når den sendes til HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/nb-NO/OrchardCore.Infrastructure.Abstractions.po b/Localization/nb-NO/OrchardCore.Infrastructure.Abstractions.po
index 8491c69ceb14c..e6208b0272f42 100644
--- a/Localization/nb-NO/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/nb-NO/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/nb-NO/OrchardCore.Layers.po b/Localization/nb-NO/OrchardCore.Layers.po
index 3b9bec6ef4500..365d78226e916 100644
--- a/Localization/nb-NO/OrchardCore.Layers.po
+++ b/Localization/nb-NO/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Opprett lag"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Navn"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Rediger lag - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Navn"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Rediger Dingser og Lag"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Dingsen ble flyttet. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Angre</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Soner"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Vennligst <a href=\"{0}\">angi tilgjengelige soner</a> før du legger til Dingser"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Legg til dings"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Lag"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Velg et lag for å vise tilknyttede dingser."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Rediger"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Slette"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Vennligst <a href=\"{0}\">legg til lag</a> før du legger til Dingser"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Legg til"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Bestemmer om tittelen vil bli gjengitt sammen med dingsen."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Laget som dingsen skal knyttes til."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/nb-NO/OrchardCore.Liquid.po b/Localization/nb-NO/OrchardCore.Liquid.po
index 1b12fd0d68761..b61ba39ae4ec7 100644
--- a/Localization/nb-NO/OrchardCore.Liquid.po
+++ b/Localization/nb-NO/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/nb-NO/OrchardCore.Lists.po b/Localization/nb-NO/OrchardCore.Lists.po
index 803cb398130f1..4e6fa91937262 100644
--- a/Localization/nb-NO/OrchardCore.Lists.po
+++ b/Localization/nb-NO/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Representerer en lenke til det overordnede innholdselementet, og rekkefølgen innholdselementet vises."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Representerer en samling av innholdselementer."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Det angitte blogginnlegget finnes ikke lenger. Vennligst opprett et nytt innlegg."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Ikke autorisert til å slette dette innholdet"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Brukernavnet, e-posten eller passordet er feil."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Listen er tom"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Merk av for å aktivere manuell rankering av elementer."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Lister"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Legg til et foreldre menyelement"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/nb-NO/OrchardCore.Localization.po b/Localization/nb-NO/OrchardCore.Localization.po
index 112ab9296ab4e..cccd2202c84f3 100644
--- a/Localization/nb-NO/OrchardCore.Localization.po
+++ b/Localization/nb-NO/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Kulturer"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "En kultur er påkrevd"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Aktive kulturer konfigurert for denne nettsiden."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Legg til kultur"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/nb-NO/OrchardCore.Markdown.po b/Localization/nb-NO/OrchardCore.Markdown.po
index 9434df997e74d..087d46396beb2 100644
--- a/Localization/nb-NO/OrchardCore.Markdown.po
+++ b/Localization/nb-NO/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Hoveddelen av innholdet i Markdown format."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/nb-NO/OrchardCore.Media.po b/Localization/nb-NO/OrchardCore.Media.po
index 911b9176301fa..e477262439161 100644
--- a/Localization/nb-NO/OrchardCore.Media.po
+++ b/Localization/nb-NO/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/nb-NO/OrchardCore.Menu.po b/Localization/nb-NO/OrchardCore.Menu.po
index 424c1c1fb3d2d..3b1f1b9742eeb 100644
--- a/Localization/nb-NO/OrchardCore.Menu.po
+++ b/Localization/nb-NO/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menyer"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Rediger {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Navn"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/nb-NO/OrchardCore.Microsoft.Authentication.po b/Localization/nb-NO/OrchardCore.Microsoft.Authentication.po
index 90ac06e6c2755..5c34703e1d7e7 100644
--- a/Localization/nb-NO/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/nb-NO/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Microsoft Account Authentication innstillinger"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "Application ID fra Microsoft developer portal parametrene."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Application Secret Key fra Microsoft developer portal parametrene."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/nb-NO/OrchardCore.Navigation.po b/Localization/nb-NO/OrchardCore.Navigation.po
index ebaeb37e75b3b..42c8757d4c32d 100644
--- a/Localization/nb-NO/OrchardCore.Navigation.po
+++ b/Localization/nb-NO/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.Notifications.po b/Localization/nb-NO/OrchardCore.Notifications.po
index 56a5f25ca1ed2..829413845ab1e 100644
--- a/Localization/nb-NO/OrchardCore.Notifications.po
+++ b/Localization/nb-NO/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/nb-NO/OrchardCore.OpenId.po b/Localization/nb-NO/OrchardCore.OpenId.po
index e5563057afca3..daaf8d60c0ef6 100644
--- a/Localization/nb-NO/OrchardCore.OpenId.po
+++ b/Localization/nb-NO/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/nb-NO/OrchardCore.Placements.po b/Localization/nb-NO/OrchardCore.Placements.po
index 831ff6198fc5f..ef598158359f4 100644
--- a/Localization/nb-NO/OrchardCore.Placements.po
+++ b/Localization/nb-NO/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/nb-NO/OrchardCore.ProjectTemplates.po b/Localization/nb-NO/OrchardCore.ProjectTemplates.po
index 5308425f90c7c..62e40ddd9d446 100644
--- a/Localization/nb-NO/OrchardCore.ProjectTemplates.po
+++ b/Localization/nb-NO/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Vis"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/nb-NO/OrchardCore.PublishLater.po b/Localization/nb-NO/OrchardCore.PublishLater.po
index ccde5ee0886bb..55a67ba8dad2d 100644
--- a/Localization/nb-NO/OrchardCore.PublishLater.po
+++ b/Localization/nb-NO/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publiser senere"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Avbryt publisering"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/nb-NO/OrchardCore.Queries.po b/Localization/nb-NO/OrchardCore.Queries.po
index b81f9dfe2ee77..33f978480f1e6 100644
--- a/Localization/nb-NO/OrchardCore.Queries.po
+++ b/Localization/nb-NO/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/nb-NO/OrchardCore.ReCaptcha.Core.po b/Localization/nb-NO/OrchardCore.ReCaptcha.Core.po
index 50669b2262eb5..850b2fe536c79 100644
--- a/Localization/nb-NO/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/nb-NO/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2021-07-15 19:00\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Captcha ikke validert"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Captcha ikke validert"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Språk med navn {0} ikke funnet"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/nb-NO/OrchardCore.ReCaptcha.po b/Localization/nb-NO/OrchardCore.ReCaptcha.po
index e5330299c8d03..6fa2cca792bc0 100644
--- a/Localization/nb-NO/OrchardCore.ReCaptcha.po
+++ b/Localization/nb-NO/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Eksporterer innstillingene for ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Validerer ReCaptcha Oppgave"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validering"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Ferdig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Gyldig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Captcha validering mislyktes. Prøv igjen."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Instansen vil lastes på nytt når innstillingene lagres."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Din Google reCaptcha Site Key."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/nb-NO/OrchardCore.Recipes.Core.po b/Localization/nb-NO/OrchardCore.Recipes.Core.po
index 52a1a1fff7ed4..bb1d4a7ca04fd 100644
--- a/Localization/nb-NO/OrchardCore.Recipes.Core.po
+++ b/Localization/nb-NO/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/nb-NO/OrchardCore.Roles.po b/Localization/nb-NO/OrchardCore.Roles.po
index b54ad87312ec6..a18404165422c 100644
--- a/Localization/nb-NO/OrchardCore.Roles.po
+++ b/Localization/nb-NO/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Roller"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Ugyldig rollenavn."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rollen ble oppdatert."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Kan ikke slette systemroller."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Opprett rolle"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Rollenavn"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Rediger rolle Detaljer"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Tillatelse"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Denne tillatelsen kan gi en bruker mulighet å innvilge seg andre tillatelser. Bruk den med ekstrem varsomhet."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Avbryt"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Roller"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/nb-NO/OrchardCore.Rules.po b/Localization/nb-NO/OrchardCore.Rules.po
index 2bc7fcdb84a65..064e912b191bd 100644
--- a/Localization/nb-NO/OrchardCore.Rules.po
+++ b/Localization/nb-NO/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/nb-NO/OrchardCore.Search.Elasticsearch.po b/Localization/nb-NO/OrchardCore.Search.Elasticsearch.po
index 82ac43e914383..e1ebc90bd8dac 100644
--- a/Localization/nb-NO/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/nb-NO/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/nb-NO/OrchardCore.Search.Lucene.po b/Localization/nb-NO/OrchardCore.Search.Lucene.po
index 2214bd5dbbeef..598e20dc71715 100644
--- a/Localization/nb-NO/OrchardCore.Search.Lucene.po
+++ b/Localization/nb-NO/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.Search.po b/Localization/nb-NO/OrchardCore.Search.po
index 7ed993bfc6065..93fa11926b1da 100644
--- a/Localization/nb-NO/OrchardCore.Search.po
+++ b/Localization/nb-NO/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/nb-NO/OrchardCore.Security.po b/Localization/nb-NO/OrchardCore.Security.po
index d7d11ada92306..4cf40f8d8b285 100644
--- a/Localization/nb-NO/OrchardCore.Security.po
+++ b/Localization/nb-NO/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/nb-NO/OrchardCore.Seo.po b/Localization/nb-NO/OrchardCore.Seo.po
index 347e1be5eeadd..b000e4b79f480 100644
--- a/Localization/nb-NO/OrchardCore.Seo.po
+++ b/Localization/nb-NO/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-15 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/nb-NO/OrchardCore.Settings.po b/Localization/nb-NO/OrchardCore.Settings.po
index 9791b762fb787..115c12122daf3 100644
--- a/Localization/nb-NO/OrchardCore.Settings.po
+++ b/Localization/nb-NO/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/nb-NO/OrchardCore.Setup.Core.po b/Localization/nb-NO/OrchardCore.Setup.Core.po
index 4f66569254b36..030664ceff5e8 100644
--- a/Localization/nb-NO/OrchardCore.Setup.Core.po
+++ b/Localization/nb-NO/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/nb-NO/OrchardCore.Setup.po b/Localization/nb-NO/OrchardCore.Setup.po
index 2699ee5fce1df..5c7db4b3ef61c 100644
--- a/Localization/nb-NO/OrchardCore.Setup.po
+++ b/Localization/nb-NO/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Passordet må ha minst {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Det er ikke mulig å sette opp et nettsted uten en oppskrift."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Dette brukes som standardtittelen på sidene."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Oppskrifter lar deg sette opp nettstedet med ytterligere forhåndskonfigurerte alternativer, funksjoner og innstillinger ut av esken."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Bestemmer standard tidssone som brukes ved visning og redigering av dato og tid."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Databasen brukes til å lagre nettstedets konfigurasjon og innhold."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Du kan spesifisere et tabellprefiks hvis du har tenkt å bruke den samme databasen på flere nettsteder."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Vis/Skjul tilkoblingsstreng"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Superbrukeren har alle rettigheter. Den bør bare brukes ved oppsett og ved gjenoppretting etter katastrofer."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Brukernavn"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "E-posten er ugyldig."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Passordstyrke"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/nb-NO/OrchardCore.Shortcodes.po b/Localization/nb-NO/OrchardCore.Shortcodes.po
index fb3a3e62a607a..3b5dbcc2f413c 100644
--- a/Localization/nb-NO/OrchardCore.Shortcodes.po
+++ b/Localization/nb-NO/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/nb-NO/OrchardCore.Sitemaps.po b/Localization/nb-NO/OrchardCore.Sitemaps.po
index 51ebb3b364919..2a056e6e54158 100644
--- a/Localization/nb-NO/OrchardCore.Sitemaps.po
+++ b/Localization/nb-NO/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/nb-NO/OrchardCore.Sms.po b/Localization/nb-NO/OrchardCore.Sms.po
index 82b8d6592b198..712e70060fcff 100644
--- a/Localization/nb-NO/OrchardCore.Sms.po
+++ b/Localization/nb-NO/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/nb-NO/OrchardCore.Spatial.po b/Localization/nb-NO/OrchardCore.Spatial.po
index 801721d202905..2838801059200 100644
--- a/Localization/nb-NO/OrchardCore.Spatial.po
+++ b/Localization/nb-NO/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/nb-NO/OrchardCore.Taxonomies.po b/Localization/nb-NO/OrchardCore.Taxonomies.po
index d765a2e03074e..5928c4d647d84 100644
--- a/Localization/nb-NO/OrchardCore.Taxonomies.po
+++ b/Localization/nb-NO/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Verdi kreves for '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Tagger"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomien ble ikke funnet. Vennligst sjekk innstillingene for dette feltet."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Feil ved oppretting av tag"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Skriv inn søkeord"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Velg"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Fjerne"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Trykk Enter for å lage tag"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Ingen tagger funnet"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Tagger"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomien ble ikke funnet. Vennligst sjekk innstillingene for dette feltet."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Hintet som skal vises for dette feltet i tekstbehandleren."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taksonomi"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Obligatorisk"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Om minst ett element er valgt."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unik"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Om bare ett element kan velges."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Bare blad"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Om blader er de eneste elementene som kan velges."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Om nye tagger kan opprettes fritt. Merk: Når tagger opprettes fritt vil kun visningstekst bli definert."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "'Begrep' innholdstype"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Legg til {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Du har omordnet taksonomien."
diff --git a/Localization/nb-NO/OrchardCore.Templates.Cms.Module.po b/Localization/nb-NO/OrchardCore.Templates.Cms.Module.po
index 75148f765a3c3..f8a2f7072d3b8 100644
--- a/Localization/nb-NO/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/nb-NO/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Vis"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/nb-NO/OrchardCore.Templates.po b/Localization/nb-NO/OrchardCore.Templates.po
index d9977a6855357..b3a514a5482c6 100644
--- a/Localization/nb-NO/OrchardCore.Templates.po
+++ b/Localization/nb-NO/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Navnet på malen."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Beskrivelsen av malen."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Navnet på malen."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Beskrivelsen av malen."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/nb-NO/OrchardCore.Tenants.po b/Localization/nb-NO/OrchardCore.Tenants.po
index 71ae0a6082686..048d1fa5dc741 100644
--- a/Localization/nb-NO/OrchardCore.Tenants.po
+++ b/Localization/nb-NO/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/nb-NO/OrchardCore.Tests.po b/Localization/nb-NO/OrchardCore.Tests.po
index 1ee68463bbf87..5e120a1b29953 100644
--- a/Localization/nb-NO/OrchardCore.Tests.po
+++ b/Localization/nb-NO/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/nb-NO/OrchardCore.Themes.po b/Localization/nb-NO/OrchardCore.Themes.po
index d8044b58314f4..64d526ffc300a 100644
--- a/Localization/nb-NO/OrchardCore.Themes.po
+++ b/Localization/nb-NO/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Eksporterer valgt nettstedstema og admin tema."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/nb-NO/OrchardCore.Title.po b/Localization/nb-NO/OrchardCore.Title.po
index 1bf414c13cf96..e29999e3b6ffa 100644
--- a/Localization/nb-NO/OrchardCore.Title.po
+++ b/Localization/nb-NO/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mønsteret inneholder ingen gyldig Liquid uttrykk. Detaljer: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Merk av for å gjengi tittelen ved visning."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nb-NO/OrchardCore.Twitter.po b/Localization/nb-NO/OrchardCore.Twitter.po
index adb48fdade3c3..22101c02ef1ce 100644
--- a/Localization/nb-NO/OrchardCore.Twitter.po
+++ b/Localization/nb-NO/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Access Token Secret er obligatorisk"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Oppdater Twitter Status Task"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Sosial"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Ferdig"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Mislyktes"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Instansen vil lastes på nytt når innstillingene lagres."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Twitter integrasjonsinnstillinger"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "API key, definert i fanen 'Keys and Tokens' i twitter kontroll panelet."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "API secret, definert i fanen 'Keys and Tokens' i twitter kontroll panelet."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Access Token, definert i fanen 'Keys and Tokens' i twitter kontroll panelet."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Access Token Secret, definert i fanen 'Keys and Tokens' i twitter kontroll panelet."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Logg inn med Twitter innstillinger"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Oppdater Twitter Status"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/nb-NO/OrchardCore.Users.Core.po b/Localization/nb-NO/OrchardCore.Users.Core.po
index 4bc09425b8d57..5e057241772a5 100644
--- a/Localization/nb-NO/OrchardCore.Users.Core.po
+++ b/Localization/nb-NO/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-post '{0}' er ugyldig."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Uventet feil: '{0}'."
diff --git a/Localization/nb-NO/OrchardCore.Users.po b/Localization/nb-NO/OrchardCore.Users.po
index 8e05d9be5a93f..d83153688ae24 100644
--- a/Localization/nb-NO/OrchardCore.Users.po
+++ b/Localization/nb-NO/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/nb-NO/OrchardCore.Widgets.po b/Localization/nb-NO/OrchardCore.Widgets.po
index 399fadc0cb87a..eddb5d375e75a 100644
--- a/Localization/nb-NO/OrchardCore.Widgets.po
+++ b/Localization/nb-NO/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Legg til dings"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/nb-NO/OrchardCore.Workflows.po b/Localization/nb-NO/OrchardCore.Workflows.po
index fa73ba1391256..7a2c061a0e892 100644
--- a/Localization/nb-NO/OrchardCore.Workflows.po
+++ b/Localization/nb-NO/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/nb-NO/TheAdmin.po b/Localization/nb-NO/TheAdmin.po
index b2384b9e6005e..993de9ccc9100 100644
--- a/Localization/nb-NO/TheAdmin.po
+++ b/Localization/nb-NO/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Skjul / utvid meny"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Slette"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Er du sikker på at du vil slette dette elementet?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/nb-NO/TheAgencyTheme.po b/Localization/nb-NO/TheAgencyTheme.po
index a9d386e19c7fe..afc0d6df15d8e 100644
--- a/Localization/nb-NO/TheAgencyTheme.po
+++ b/Localization/nb-NO/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Det finnes ingen slike resultater."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Siden du ønsket ble ikke funnet."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/nb-NO/TheBlogTheme.po b/Localization/nb-NO/TheBlogTheme.po
index b89aff6befb7e..efa6cd541a9c8 100644
--- a/Localization/nb-NO/TheBlogTheme.po
+++ b/Localization/nb-NO/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-02-18 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "på {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Det finnes ingen slike resultater."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Siden finns ikke"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/nb-NO/TheTheme.po b/Localization/nb-NO/TheTheme.po
index 0768dccc28fb5..fd4137d857f88 100644
--- a/Localization/nb-NO/TheTheme.po
+++ b/Localization/nb-NO/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/nl/OrchardCore.Admin.po b/Localization/nl/OrchardCore.Admin.po
index ade465a9d2eb3..47d24b8748d84 100644
--- a/Localization/nl/OrchardCore.Admin.po
+++ b/Localization/nl/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Admin"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Admin instellingen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exporteert de admin-instellingen."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Welkom bij Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Blader gerust door het menu en ontdek alle mogelijkheden."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Inschakelen van donkere modus in admin thema"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Of een donkere modus in het admin thema wordt weergegeven."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Of titels in de bovenste balk worden weergegeven."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/nl/OrchardCore.AdminDashboard.po b/Localization/nl/OrchardCore.AdminDashboard.po
index 7090dc03c8549..06d2162f915d7 100644
--- a/Localization/nl/OrchardCore.AdminDashboard.po
+++ b/Localization/nl/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -18,25 +18,25 @@ msgstr ""
 #: OrchardCore.AdminDashboard\Views\Dashboard.DeleteButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DeleteButton"
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #: OrchardCore.AdminDashboard\Views\Dashboard.DeleteButton.cshtml:3
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DeleteButton"
 msgid "Are you sure you want to delete this content item?"
-msgstr ""
+msgstr "Weet u zeker dat u deze inhoud wilt verwijderen?"
 
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.DeleteButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DeleteButton"
 msgid "Ok"
-msgstr ""
+msgstr "Oke"
 
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.DeleteButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DeleteButton"
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. data-url-af="UnsafeUrl RemoveUrl" data-title=@T["Discard Draft"] data-message=@T["Are you sure you want to discard this draft?"]
 #. data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-ok-class="btn-primary">@T["Discard Draft"]</a>
@@ -44,37 +44,37 @@ msgstr ""
 #: OrchardCore.AdminDashboard\Views\Dashboard.DiscardDraftButton.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DiscardDraftButton"
 msgid "Discard Draft"
-msgstr ""
+msgstr "Concept verwijderen"
 
 #. data-url-af="UnsafeUrl RemoveUrl" data-title=@T["Discard Draft"] data-message=@T["Are you sure you want to discard this draft?"]
 #: OrchardCore.AdminDashboard\Views\Dashboard.DiscardDraftButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DiscardDraftButton"
 msgid "Are you sure you want to discard this draft?"
-msgstr ""
+msgstr "Weet u zeker dat u dit concept wilt verwijderen?"
 
 #. data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-ok-class="btn-primary">@T["Discard Draft"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.DiscardDraftButton.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DiscardDraftButton"
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-ok-class="btn-primary">@T["Discard Draft"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.DiscardDraftButton.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DiscardDraftButton"
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #. @T["Edit"]
 #: OrchardCore.AdminDashboard\Views\Dashboard.EditButton.cshtml:2
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.EditButton"
 msgid "Edit"
-msgstr ""
+msgstr "Bewerken"
 
 #. data-url-af="UnsafeUrl">@T["Publish Draft"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.PublishButton.cshtml:3
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.PublishButton"
 msgid "Publish Draft"
-msgstr ""
+msgstr "Publiceer concept"
 
 #. data-url-af="UnsafeUrl RemoveUrl" data-title=@T["Unpublish"] data-message=@T["Are you sure you want to unpublish this item?"]
 #. data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-ok-class="btn-primary">@T["Unpublish"]</a>
@@ -82,49 +82,49 @@ msgstr ""
 #: OrchardCore.AdminDashboard\Views\Dashboard.UnpublishButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "Unpublish"
-msgstr ""
+msgstr "Depubliceer"
 
 #. data-url-af="UnsafeUrl RemoveUrl" data-title=@T["Unpublish"] data-message=@T["Are you sure you want to unpublish this item?"]
 #: OrchardCore.AdminDashboard\Views\Dashboard.UnpublishButton.cshtml:3
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "Are you sure you want to unpublish this item?"
-msgstr ""
+msgstr "Weet je zeker dat je de publicatie ongedaan wilt maken?"
 
 #. data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-ok-class="btn-primary">@T["Unpublish"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.UnpublishButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-ok-class="btn-primary">@T["Unpublish"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.UnpublishButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
-msgstr ""
+msgstr "Positie"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
-msgstr ""
+msgstr "Breedte"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
-msgstr ""
+msgstr "Hoogte"
 
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Author"]">
 #: OrchardCore.AdminDashboard\Views\DashboardWidget-ContentsMetadata.DetailAdmin.cshtml:28
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardWidget-ContentsMetadata.DetailAdmin"
 msgid "Author"
-msgstr ""
+msgstr "Auteur"
 
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Status"]">
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Status"]">
@@ -132,83 +132,83 @@ msgstr ""
 #: OrchardCore.AdminDashboard\Views\DashboardWidget-ContentsTags.DetailAdmin.cshtml:20
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardWidget-ContentsTags.DetailAdmin"
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. <i class="fa-solid fa-check text-success" aria-hidden="true"></i> @T["Published"]
 #: OrchardCore.AdminDashboard\Views\DashboardWidget-ContentsTags.DetailAdmin.cshtml:14
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardWidget-ContentsTags.DetailAdmin"
 msgid "Published"
-msgstr ""
+msgstr "Gepubliceerd"
 
 #. <i class="fa-solid fa-pencil text-primary" aria-hidden="true"></i> @T["Draft"]
 #: OrchardCore.AdminDashboard\Views\DashboardWidget-ContentsTags.DetailAdmin.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardWidget-ContentsTags.DetailAdmin"
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. <div class="btn-group float-end" title="@T["Actions"]">
 #: OrchardCore.AdminDashboard\Views\DashboardWidget.DetailAdmin.cshtml:9
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardWidget.DetailAdmin"
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #. @T["Actions"]
 #: OrchardCore.AdminDashboard\Views\DashboardWidget.SummaryAdmin.cshtml:46
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardWidget.SummaryAdmin"
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #. @T["Manage Dashboard"]
 #: OrchardCore.AdminDashboard\Views\Dashboard\Index.cshtml:28
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Index"
 msgid "Manage Dashboard"
-msgstr ""
+msgstr "Dashboard beheren"
 
 #. <zone Name="Title"><h1 class="float-start">@RenderTitleSegments(T["Dashboard"])</h1></zone>
 #: OrchardCore.AdminDashboard\Views\Dashboard\Index.cshtml:35
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Index"
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. @T["Click on Manage Dashboard button to add dashboard widget."]
 #: OrchardCore.AdminDashboard\Views\Dashboard\Index.cshtml:50
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Index"
 msgid "Click on Manage Dashboard button to add dashboard widget."
-msgstr ""
+msgstr "Klik op Beheer Dashboard knop om dashboard widget toe te voegen."
 
 #. @T["Close Editor"]
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:24
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Manage"
 msgid "Close Editor"
-msgstr ""
+msgstr "Editor afsluiten"
 
 #. @T["Add Widget"]
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:30
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Manage"
 msgid "Add Widget"
-msgstr ""
+msgstr "Widget toevoegen"
 
 #. <zone Name="Title"><h1 class="float-start">@RenderTitleSegments(T["Dashboard"])</h1></zone>
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:41
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Manage"
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. @T["Dashboard successfully updated."]&nbsp;<a href="#"><strong>@T["Undo"]</strong></a>.
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:55
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Manage"
 msgid "Dashboard successfully updated."
-msgstr ""
+msgstr "Dashboard succesvol geupdate."
 
 #. @T["Dashboard successfully updated."]&nbsp;<a href="#"><strong>@T["Undo"]</strong></a>.
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:55
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Manage"
 msgid "Undo"
-msgstr ""
+msgstr "Ongedaan maken"
 
 #. <span class="icon"><i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i></span><span class="title">@T["Dashboard"]</span>
 #: OrchardCore.AdminDashboard\Views\NavigationItemText-dashboard.Id.cshtml:1
 msgctxt "OrchardCore.AdminDashboard.Views.NavigationItemText-dashboard.Id"
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
diff --git a/Localization/nl/OrchardCore.AdminMenu.po b/Localization/nl/OrchardCore.AdminMenu.po
index 301dd6566bc65..abfed6ffaeabe 100644
--- a/Localization/nl/OrchardCore.AdminMenu.po
+++ b/Localization/nl/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Admin menu aanmaken {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Naam"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Creëer Knooppunt"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Admin menu bewerken: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Naam"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Bewerk Knooppunt"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "De prioriteit van deze link om als aktief te worden weergegeven, in plaats van een andere, wanneer beide wijzen naar dezelfde url. De link met de hoogste waarde heeft de actieve status in de navigatie."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "De positie van deze link in het admin menu."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Koppeling"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "De koppelingstekst zoals deze wordt getoond in de boom."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "De URL van de link. Een link wordt alleen getoond als deze of een van hun kinderen een URL heeft. De URL zal relatief zijn ten opzichte van de root van de admin site"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Kies een icoon"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Plaatshouder"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "De tekst van het menu-item zoals het zal worden weergegeven in de boomstructuur."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Kies"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Selecteer een icoon om weer te geven wanneer dit menu-item op het eerste niveau is."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Kies een icoon"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Rechten"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Typ om te zoeken"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Selecteer"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Geen resultaten gevonden"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "De bevoegdheden die nodig zijn om dit menu-item weer te geven (optioneel)."
diff --git a/Localization/nl/OrchardCore.Alias.po b/Localization/nl/OrchardCore.Alias.po
index 667d5c220f9cd..3c6549baab665 100644
--- a/Localization/nl/OrchardCore.Alias.po
+++ b/Localization/nl/OrchardCore.Alias.po
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
 msgctxt "OrchardCore.Alias.GraphQL.AliasInputObjectType"
 msgid "the alias part of the content item"
-msgstr "het alias onderdeel van het inhoudsitem"
+msgstr "de alias onderdeel van het inhoudsitem"
 
 #. AddScalarFilterFields<StringGraphType>("alias", S["the alias of the content item"]);
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:15
@@ -34,25 +34,25 @@ msgstr "Alternatief pad voor het inhoudsitem"
 #: OrchardCore.Alias\Models\AliasPartExtensions.cs:18
 msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is too long. The alias can only be up to {0} characters. \"{1}\""
-msgstr ""
+msgstr "Alias is te lang, deze mag maximaal {0} tekens bevatten. \"{1}\""
 
 #. yield return new ValidationResult(S["Your alias is already in use. \"{0}\"", part.Alias], new[] { nameof(part.Alias) });
 #: OrchardCore.Alias\Models\AliasPartExtensions.cs:23
 msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
-msgstr ""
+msgstr "Alias is al in gebruik. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Patroon bevat geen geldige Liquid expressie. Details: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. @T["The alias of the content item."]
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:16
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Laat leeg om het opnieuw te genereren."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias is gegenereerd en invoer is uitgeschakeld"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nl/OrchardCore.Apis.GraphQL.po b/Localization/nl/OrchardCore.Apis.GraphQL.po
index d0695ba98179f..28d1aea99bb97 100644
--- a/Localization/nl/OrchardCore.Apis.GraphQL.po
+++ b/Localization/nl/OrchardCore.Apis.GraphQL.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:43\n"
+"PO-Revision-Date: 2023-11-26 20:47\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Apis.GraphQL\AdminMenu.cs:25
@@ -24,23 +24,23 @@ msgstr "Configuratie"
 #: OrchardCore.Apis.GraphQL\AdminMenu.cs:26
 msgctxt "OrchardCore.Apis.GraphQL.AdminMenu"
 msgid "GraphiQL"
-msgstr ""
+msgstr "GraphiQL"
 
 #. var errorMessage = S["'{0}' exceeds the maximum number of results for '{1}' ({2})", value.Value, arg.Name, _maxNumberOfResults];
 #: OrchardCore.Apis.GraphQL\ValidationRules\MaxNumberOfResultsValidationRule.cs:54
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.MaxNumberOfResultsValidationRule"
 msgid "'{0}' exceeds the maximum number of results for '{1}' ({2})"
-msgstr ""
+msgstr "'{0}' overschrijdt het maximale aantal resultaten voor '{1}' ({2})"
 
 #. S["Authorization is required to access {0}.", operationName],
 #: OrchardCore.Apis.GraphQL\ValidationRules\RequiresPermissionValidationRule.cs:67
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.RequiresPermissionValidationRule"
 msgid "Authorization is required to access {0}."
-msgstr ""
+msgstr "Autorisatie is vereist voor toegang tot {0}."
 
 #. S["Authorization is required to access the node. {0}", nodeName],
 #: OrchardCore.Apis.GraphQL\ValidationRules\RequiresPermissionValidationRule.cs:120
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.RequiresPermissionValidationRule"
 msgid "Authorization is required to access the node. {0}"
-msgstr ""
+msgstr "Autorisatie is vereist voor toegang tot de node. {0}"
 
diff --git a/Localization/nl/OrchardCore.ArchiveLater.po b/Localization/nl/OrchardCore.ArchiveLater.po
index 92a27d5b94d57..c896460f1693a 100644
--- a/Localization/nl/OrchardCore.ArchiveLater.po
+++ b/Localization/nl/OrchardCore.ArchiveLater.po
@@ -10,29 +10,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
-msgstr ""
+msgstr "Archiveer later"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
-msgstr ""
+msgstr "Archiveer later annuleren"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
-msgstr ""
+msgstr "Standaard"
 
 #. <span class="hint">@T["Scheduled to be archived on {0}", (object)(await DisplayAsync(await New.DateTime(Utc: Model.ScheduledArchiveUtc)))]</span>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.SummaryAdmin.cshtml:6
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.SummaryAdmin"
 msgid "Scheduled to be archived on {0}"
-msgstr ""
+msgstr "Gepland om te worden gearchiveerd op {0}"
 
diff --git a/Localization/nl/OrchardCore.AuditTrail.po b/Localization/nl/OrchardCore.AuditTrail.po
index 4cd7846a5971b..93d57c6c65d63 100644
--- a/Localization/nl/OrchardCore.AuditTrail.po
+++ b/Localization/nl/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Audit logboek"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Alle categorieën"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Aangepaste tijdsperiode"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -156,91 +156,91 @@ msgstr "Exporteert de audit logboek instellingen."
 #: OrchardCore.AuditTrail\Startup.cs:165
 msgctxt "OrchardCore.AuditTrail.DeploymentStartup"
 msgid "Audit Trail Trimming settings"
-msgstr ""
+msgstr "Audittrail trim instellingen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AuditTrailTrimmingSettings, DeploymentStartup>(S => S["Audit Trail Trimming settings"], S => S["Exports the audit trail trimming settings."]);
 #: OrchardCore.AuditTrail\Startup.cs:165
 msgctxt "OrchardCore.AuditTrail.DeploymentStartup"
 msgid "Exports the audit trail trimming settings."
-msgstr ""
+msgstr "Exporteert de audittrail trim instellingen."
 
 #. <h4 class="card-title">@T["Category"]</h4>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Category.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Category.Thumbnail"
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. <p>@T["Filters on the audit trail category."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Category.Thumbnail.cshtml:8
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Category.Thumbnail"
 msgid "Filters on the audit trail category."
-msgstr ""
+msgstr "Filtert op de audittrail categorie."
 
 #. <h4 class="card-title">@T["Id"]</h4>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-CorrelationId.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-CorrelationId.Thumbnail"
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
 #. <p>@T["Filters on a correlation id."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-CorrelationId.Thumbnail.cshtml:8
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-CorrelationId.Thumbnail"
 msgid "Filters on a correlation id."
-msgstr ""
+msgstr "Filtert op een correlatie-id."
 
 #. <h4 class="card-title">@T["Date"]</h4>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Date.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Date.Thumbnail"
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. <p>@T["Filters by a date or range."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Date.Thumbnail.cshtml:8
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Date.Thumbnail"
 msgid "Filters by a date or range."
-msgstr ""
+msgstr "Filtert op een datum of bereik."
 
 #. <span class="hint">@T["ISO 8601 date format *see date range syntax"]</span>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Date.Thumbnail.cshtml:9
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Date.Thumbnail"
 msgid "ISO 8601 date format *see date range syntax"
-msgstr ""
+msgstr "ISO 8601 datumnotatie *zie datumbereik syntax"
 
 #. <h4 class="card-title">@T["Event"]</h4>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Event.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Event.Thumbnail"
 msgid "Event"
-msgstr ""
+msgstr "Gebeurtenis"
 
 #. <p>@T["Filters on the audit trail event, when a Correlation Id is used."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-Event.Thumbnail.cshtml:8
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-Event.Thumbnail"
 msgid "Filters on the audit trail event, when a Correlation Id is used."
-msgstr ""
+msgstr "Filtert op de audittrail gebeurtenis, als een correlatie-id wordt gebruikt."
 
 #. <h4 class="card-title">@T["User Id"]</h4>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-UserId.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-UserId.Thumbnail"
 msgid "User Id"
-msgstr ""
+msgstr "Gebruikers Id"
 
 #. <p>@T["Filters by the id of a user."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-UserId.Thumbnail.cshtml:8
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-UserId.Thumbnail"
 msgid "Filters by the id of a user."
-msgstr ""
+msgstr "Filtert op het id van een gebruiker."
 
 #. <h4 class="card-title">@T["User Name"]</h4>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-UserName.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-UserName.Thumbnail"
 msgid "User Name"
-msgstr ""
+msgstr "Gebruikersnaam"
 
 #. <p>@T["Filters by the name of a user."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-UserName.Thumbnail.cshtml:8
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-UserName.Thumbnail"
 msgid "Filters by the name of a user."
-msgstr ""
+msgstr "Filtert op de naam van een gebruiker."
 
 #. @T["No results found."]
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminList.cshtml:43
@@ -296,7 +296,7 @@ msgstr "Sorteer"
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:21
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Filters"
-msgstr ""
+msgstr "Filters"
 
 #. <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#modalAuditTrailIndexOptionsFilterSyntax">@T["Filter syntax"]</a></li>
 #. <h4>@T["Filter syntax"]</h4>
@@ -304,7 +304,7 @@ msgstr ""
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:55
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Filter syntax"
-msgstr ""
+msgstr "Filter syntax"
 
 #. <label asp-for="SearchText" class="sr-only">@T["Search"]</label>
 #. <input asp-for="SearchText" class="form-control" placeholder="@T["Search"]" inputmode="search" type="search" autofocus />
@@ -330,167 +330,167 @@ msgstr "Standaard"
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:60
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "may be entered with or without the term name"
-msgstr ""
+msgstr "kan worden ingevoerd met of zonder de naam van de term"
 
 #. <span class="hint">@T["Single"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:64
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Single"
-msgstr ""
+msgstr "Enkelvoudig"
 
 #. <span class="hint dashed">@T["A single value can be entered"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:65
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "A single value can be entered"
-msgstr ""
+msgstr "Een enkele waarde kan worden ingevoerd"
 
 #. <span class="hint">@T["Multiple"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:69
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Multiple"
-msgstr ""
+msgstr "Meervoudig"
 
 #. <span class="hint dashed">@T["Logical operators and groups are supported"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:70
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Logical operators and groups are supported"
-msgstr ""
+msgstr "Logische operators en groepen worden ondersteund"
 
 #. <span class="hint dashed">@T["The default operator when whitespace is found, e.g. {0}", "text:foo bar -> text:foo OR bar"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:75
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "The default operator when whitespace is found, e.g. {0}"
-msgstr ""
+msgstr "De standaard operator wanneer witruimte wordt gevonden, bijvoorbeeld {0}"
 
 #. <span class="hint dashed">@T["Combines, e.g. {0}", "text:foo AND bar"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:79
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Combines, e.g. {0}"
-msgstr ""
+msgstr "Combineert, bijvoorbeeld {0}"
 
 #. <span class="hint dashed">@T["Negates, e.g. {0}", "text:foo NOT bar"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:83
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Negates, e.g. {0}"
-msgstr ""
+msgstr "Negeert, bijvoorbeeld {0}"
 
 #. <span class="hint">@T["Groups operators, e.g. {0}", "text:((foo OR bar) NOT baz)"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:87
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Groups operators, e.g. {0}"
-msgstr ""
+msgstr "Groepeert operatoren, bijvoorbeeld {0}"
 
 #. <span class="hint">@T["Escape operators, e.g. {0}", "text:\"foo bar\""]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:91
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Escape operators, e.g. {0}"
-msgstr ""
+msgstr "Escape operatoren, bijvoorbeeld {0}"
 
 #. <h4>@T["Date range syntax"]</h4>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:96
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Date range syntax"
-msgstr ""
+msgstr "Datumbereik syntax"
 
 #. <small class="d-block">@T["You can search for dates that are greater or less than another date, or fall within a date range."]</small>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:98
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "You can search for dates that are greater or less than another date, or fall within a date range."
-msgstr ""
+msgstr "U kunt zoeken naar datums die groter of kleiner zijn dan een andere datum of binnen een datumbereik liggen."
 
 #. <small class="d-block">@T["Dates should use the {0} operator or ISO 8601 date time format.", "@now"]</small>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:99
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Dates should use the {0} operator or ISO 8601 date time format."
-msgstr ""
+msgstr "Datums moeten de {0} operator of ISO 8601 datum tijdnotatie gebruiken."
 
 #. <small class="d-block">@T["Dates without a ISO 8601 UTC or time component will be parsed to the users timezone"]</small>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:100
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Dates without a ISO 8601 UTC or time component will be parsed to the users timezone"
-msgstr ""
+msgstr "Datums zonder ISO 8601 UTC of tijd zullen omgezet worden naar de tijdzone van de gebruiker"
 
 #. @T["Filter"]
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:104
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. @T["Example"]
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:107
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Example"
-msgstr ""
+msgstr "Voorbeeld"
 
 #. <span class="hint">@T["Matches dates greater than the current date minus one. {0} is also suported", "@today"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:113
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Matches dates greater than the current date minus one. {0} is also suported"
-msgstr ""
+msgstr "Komt overeen met datums groter dan de huidige datum minus een. {0} wordt ook ondersteund"
 
 #. <span class="hint">@T["{0} Matches dates between twenty days old and the current date", "date:>@now-1"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:119
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "{0} Matches dates between twenty days old and the current date"
-msgstr ""
+msgstr "{0} komt overeen met datums tussen 20 dagen oud en huidige datum"
 
 #. <span class="hint">@T["{0} Matches dates from the start of the month until the start of the next month", "@2020-01-01..@2020-01-01"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:125
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "{0} Matches dates from the start of the month until the start of the next month"
-msgstr ""
+msgstr "{0} komt overeen met datums van het begin van de maand tot het begin van de volgende maand"
 
 #. <span class="hint">@T["{0} Matches dates greater than a specified UTC offset and time", ">@@2020-01-01T09:21:03.4472810+07:00"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:131
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "{0} Matches dates greater than a specified UTC offset and time"
-msgstr ""
+msgstr "{0} komt overeen met datums groter dan een opgegeven UTC offset en tijd"
 
 #. <h4>@T["Current filter"]</h4>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:138
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Current filter"
-msgstr ""
+msgstr "Huidige filter"
 
 #. <span class="hint dashed">@T["including all implied groups and operators"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:143
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "including all implied groups and operators"
-msgstr ""
+msgstr "inclusief alle impliciete groepen en operatoren"
 
 #. <p class="alert alert-info mt-3 mb-0">@T["No current filter applied"]</p>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:147
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "No current filter applied"
-msgstr ""
+msgstr "Geen huidig filter toegepast"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Close"]</button>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:153
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. @T.Plural(Model.EventsCount, "1 item", "{0} items")
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSummary.cshtml:5
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 item"
+msgstr[1] "{0} artikelen"
 
 #. <span class="text-muted" title="@T["Items {0} to {1}", Model.StartIndex, Model.EndIndex]">@T.Plural(Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSummary.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSummary"
 msgid "Items {0} to {1}"
-msgstr ""
+msgstr "Items {0} tot {1}"
 
 #. <span class="text-muted" title="@T["Items {0} to {1}", Model.StartIndex, Model.EndIndex]">@T.Plural(Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSummary.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSummary"
 msgid " / {0} item in total"
 msgid_plural " / {0} items in total"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " / {0} item in totaal"
+msgstr[1] " / {0} items in totaal"
 
 #. <div class="btn-group" title="@T["Actions"]">
 #. <span>@T["Actions"]</span>
@@ -498,37 +498,37 @@ msgstr[1] ""
 #: OrchardCore.AuditTrail\Views\AuditTrailEvent.SummaryAdmin.cshtml:34
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailEvent.SummaryAdmin"
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #. <a class="btn btn-sm btn-primary" asp-action="Display" asp-controller="Admin" asp-route-auditTrailEventId="@Model.AuditTrailEvent.EventId">@T["Details"]</a>
 #: OrchardCore.AuditTrail\Views\AuditTrailEventActions.SummaryAdmin.cshtml:3
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailEventActions.SummaryAdmin"
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. <th class="border-top-0 w-25">@T["Category"]</th>
 #: OrchardCore.AuditTrail\Views\AuditTrailEventDetail.DetailAdmin.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailEventDetail.DetailAdmin"
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. <th>@T["Event"]</th>
 #: OrchardCore.AuditTrail\Views\AuditTrailEventDetail.DetailAdmin.cshtml:10
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailEventDetail.DetailAdmin"
 msgid "Event"
-msgstr ""
+msgstr "Gebeurtenis"
 
 #. <th>@T["User Name"]</th>
 #: OrchardCore.AuditTrail\Views\AuditTrailEventDetail.DetailAdmin.cshtml:14
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailEventDetail.DetailAdmin"
 msgid "User Name"
-msgstr ""
+msgstr "Gebruikersnaam"
 
 #. <th>@T["User ID"]</th>
 #: OrchardCore.AuditTrail\Views\AuditTrailEventDetail.DetailAdmin.cshtml:18
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailEventDetail.DetailAdmin"
 msgid "User ID"
-msgstr ""
+msgstr "Gebruikers Id"
 
 #. <th>@T["Timestamp"]</th>
 #: OrchardCore.AuditTrail\Views\AuditTrailEventDetail.DetailAdmin.cshtml:22
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/nl/OrchardCore.Autoroute.po b/Localization/nl/OrchardCore.Autoroute.po
index 879eeab1fcaf0..9c2a65438f04b 100644
--- a/Localization/nl/OrchardCore.Autoroute.po
+++ b/Localization/nl/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Vink aan om autoroute uit te schakelen voor dit inhoudsitem."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Aanvinken om te specificeren dat een onderliggend inhoudsitem wordt doorgestuurd naar een absoluut pad."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nl/OrchardCore.BackgroundTasks.po b/Localization/nl/OrchardCore.BackgroundTasks.po
index ad6a808a5b9b0..0640095d0b6bf 100644
--- a/Localization/nl/OrchardCore.BackgroundTasks.po
+++ b/Localization/nl/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/nl/OrchardCore.ContentFields.po b/Localization/nl/OrchardCore.ContentFields.po
index 982f84e714c5e..3cb75ed68a25d 100644
--- a/Localization/nl/OrchardCore.ContentFields.po
+++ b/Localization/nl/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -84,7 +84,7 @@ msgstr "Het {0} veld kan niet meerdere items bevatten."
 #: OrchardCore.ContentFields\Drivers\MultiTextFieldDisplayDriver.cs:70
 msgctxt "OrchardCore.ContentFields.Fields.MultiTextFieldDisplayDriver"
 msgid "A value is required for {0}."
-msgstr ""
+msgstr "Een waarde is vereist voor {0}."
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\NumericFieldDisplayDriver.cs:80
@@ -138,13 +138,13 @@ msgstr "Een waarde is vereist voor {0}."
 #: OrchardCore.ContentFields\Drivers\UserPickerFieldDisplayDriver.cs:88
 msgctxt "OrchardCore.ContentFields.Drivers.UserPickerFieldDisplayDriver"
 msgid "The {0} field is required."
-msgstr ""
+msgstr "Het {0} veld is verplicht."
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.UserIds), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\UserPickerFieldDisplayDriver.cs:93
 msgctxt "OrchardCore.ContentFields.Drivers.UserPickerFieldDisplayDriver"
 msgid "The {0} field cannot contain multiple items."
-msgstr ""
+msgstr "Het {0} veld kan niet meerdere items bevatten."
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.RawAddress), S["A value is required for '{0}'.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\YoutubeFieldDisplayDriver.cs:59
@@ -162,43 +162,43 @@ msgstr "Het formaat van de URL is ongeldig"
 #: OrchardCore.ContentFields\GraphQL\Types\HtmlFieldQueryObjectType.cs:28
 msgctxt "OrchardCore.ContentFields.GraphQL.HtmlFieldQueryObjectType"
 msgid "Content stored as HTML."
-msgstr ""
+msgstr "Inhoud opgeslagen als HTML."
 
 #. .Description(S["the HTML content"])
 #: OrchardCore.ContentFields\GraphQL\Types\HtmlFieldQueryObjectType.cs:32
 msgctxt "OrchardCore.ContentFields.GraphQL.HtmlFieldQueryObjectType"
 msgid "the HTML content"
-msgstr ""
+msgstr "de HTML inhoud"
 
 #. context.Fail(S["The {0} field is required.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.ContentItemIds));
 #: OrchardCore.ContentFields\Handlers\ContentPickerFieldHandler.cs:25
 msgctxt "OrchardCore.ContentFields.Handlers.ContentPickerFieldHandler"
 msgid "The {0} field is required."
-msgstr ""
+msgstr "Het {0} veld is verplicht."
 
 #. context.Fail(S["The {0} field cannot contain multiple items.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.ContentItemIds));
 #: OrchardCore.ContentFields\Handlers\ContentPickerFieldHandler.cs:30
 msgctxt "OrchardCore.ContentFields.Handlers.ContentPickerFieldHandler"
 msgid "The {0} field cannot contain multiple items."
-msgstr ""
+msgstr "Het {0} veld kan niet meerdere items bevatten."
 
 #. context.Fail(S["A value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\DateFieldHandler.cs:25
 msgctxt "OrchardCore.ContentFields.Handlers.DateFieldHandler"
 msgid "A value is required for {0}."
-msgstr ""
+msgstr "Een waarde is vereist voor {0}."
 
 #. context.Fail(S["A value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\DateTimeFieldHandler.cs:25
 msgctxt "OrchardCore.ContentFields.Handlers.DateTimeFieldHandler"
 msgid "A value is required for {0}."
-msgstr ""
+msgstr "Een waarde is vereist voor {0}."
 
 #. context.Fail(S["The url is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Url));
 #: OrchardCore.ContentFields\Handlers\LinkFieldHandler.cs:62
 msgctxt "OrchardCore.ContentFields.Handlers.LinkFieldHandler"
 msgid "The url is required for {0}."
-msgstr ""
+msgstr "De Url is vereist voor {0}."
 
 #. context.Fail(S["{0} is an invalid url.", field.Url], nameof(field.Url));
 #. context.Fail(S["{0} is an invalid url.", field.Url], nameof(field.Url));
@@ -206,73 +206,73 @@ msgstr ""
 #: OrchardCore.ContentFields\Handlers\LinkFieldHandler.cs:76
 msgctxt "OrchardCore.ContentFields.Handlers.LinkFieldHandler"
 msgid "{0} is an invalid url."
-msgstr ""
+msgstr "{0} is een ongeldige Url."
 
 #. context.Fail(S["The link text is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Text));
 #: OrchardCore.ContentFields\Handlers\LinkFieldHandler.cs:83
 msgctxt "OrchardCore.ContentFields.Handlers.LinkFieldHandler"
 msgid "The link text is required for {0}."
-msgstr ""
+msgstr "De linktekst is vereist voor {0}."
 
 #. context.Fail(S["The text default value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Text));
 #: OrchardCore.ContentFields\Handlers\LinkFieldHandler.cs:87
 msgctxt "OrchardCore.ContentFields.Handlers.LinkFieldHandler"
 msgid "The text default value is required for {0}."
-msgstr ""
+msgstr "De standaard tekstwaarde is vereist voor {0}."
 
 #. context.Fail(S["The {0} field is required.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.LocalizationSets));
 #: OrchardCore.ContentFields\Handlers\LocalizationSetContentPickerFieldHandler.cs:25
 msgctxt "OrchardCore.ContentFields.Handlers.LocalizationSetContentPickerFieldHandler"
 msgid "The {0} field is required."
-msgstr ""
+msgstr "Het {0} veld is verplicht."
 
 #. context.Fail(S["The {0} field cannot contain multiple items.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.LocalizationSets));
 #: OrchardCore.ContentFields\Handlers\LocalizationSetContentPickerFieldHandler.cs:30
 msgctxt "OrchardCore.ContentFields.Handlers.LocalizationSetContentPickerFieldHandler"
 msgid "The {0} field cannot contain multiple items."
-msgstr ""
+msgstr "Het {0} veld kan niet meerdere items bevatten."
 
 #. context.Fail(S["A value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Values));
 #: OrchardCore.ContentFields\Handlers\MultiTextFieldHandler.cs:25
 msgctxt "OrchardCore.ContentFields.Handlers.MultiTextFieldHandler"
 msgid "A value is required for {0}."
-msgstr ""
+msgstr "Een waarde is vereist voor {0}."
 
 #. context.Fail(S["A value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\NumericFieldHandler.cs:26
 msgctxt "OrchardCore.ContentFields.Handlers.NumericFieldHandler"
 msgid "A value is required for {0}."
-msgstr ""
+msgstr "Een waarde is vereist voor {0}."
 
 #. context.Fail(S["The value must be greater than {0}.", settings.Minimum.Value], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\NumericFieldHandler.cs:33
 msgctxt "OrchardCore.ContentFields.Handlers.NumericFieldHandler"
 msgid "The value must be greater than {0}."
-msgstr ""
+msgstr "Deze waarde moet groter zijn dan {0}."
 
 #. context.Fail(S["The value must be less than {0}.", settings.Maximum.Value], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\NumericFieldHandler.cs:38
 msgctxt "OrchardCore.ContentFields.Handlers.NumericFieldHandler"
 msgid "The value must be less than {0}."
-msgstr ""
+msgstr "Deze waarde moet kleiner zijn dan {0}."
 
 #. context.Fail(S["The {0} field must be an integer.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\NumericFieldHandler.cs:46
 msgctxt "OrchardCore.ContentFields.Handlers.NumericFieldHandler"
 msgid "The {0} field must be an integer."
-msgstr ""
+msgstr "Het {0} veld moet een geheel getal zijn."
 
 #. context.Fail(S["Invalid number of digits for {0}, max allowed: {1}.", context.ContentPartFieldDefinition.DisplayName(), settings.Scale], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\NumericFieldHandler.cs:50
 msgctxt "OrchardCore.ContentFields.Handlers.NumericFieldHandler"
 msgid "Invalid number of digits for {0}, max allowed: {1}."
-msgstr ""
+msgstr "Ongeldig aantal cijfers voor {0}, maximaal toegestaan: {1}."
 
 #. context.Fail(S["A value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Text));
 #: OrchardCore.ContentFields\Handlers\TextFieldHandler.cs:26
 msgctxt "OrchardCore.ContentFields.Handlers.TextFieldHandler"
 msgid "A value is required for {0}."
-msgstr ""
+msgstr "Een waarde is vereist voor {0}."
 
 #. context.Fail(S["A value is required for {0}.", context.ContentPartFieldDefinition.DisplayName()], nameof(field.Value));
 #: OrchardCore.ContentFields\Handlers\TimeFieldHandler.cs:25
@@ -326,7 +326,7 @@ msgstr ""
 #: OrchardCore.ContentFields\Settings\HtmlFieldMonacoEditorSettingsDriver.cs:50
 msgctxt "OrchardCore.ContentFields.Settings.HtmlFieldMonacoEditorSettingsDriver"
 msgid "The options are written in an incorrect format."
-msgstr ""
+msgstr "De opties zijn in een onjuist formaat geschreven."
 
 #. context.Updater.ModelState.AddModelError(Prefix + '.' + nameof(TrumbowygSettingsViewModel.Options), S["The options are written in an incorrect format."]);
 #: OrchardCore.ContentFields\Settings\HtmlFieldTrumbowygEditorSettingsDriver.cs:44
@@ -338,13 +338,13 @@ msgstr "De opties zijn in een onjuist formaat geschreven."
 #: OrchardCore.ContentFields\Settings\MultiTextFieldSettingsDriver.cs:49
 msgctxt "OrchardCore.ContentFields.Settings.MultiTextFieldSettingsDriver"
 msgid "The options are written in an incorrect format."
-msgstr ""
+msgstr "De opties zijn in een onjuist formaat geschreven."
 
 #. context.Updater.ModelState.AddModelError(Prefix + "." + nameof(MonacoSettingsViewModel.Options), S["The options are written in an incorrect format."]);
 #: OrchardCore.ContentFields\Settings\TextFieldMonacoEditorSettingsDriver.cs:49
 msgctxt "OrchardCore.ContentFields.Settings.TextFieldMonacoEditorSettingsDriver"
 msgid "The options are written in an incorrect format."
-msgstr ""
+msgstr "De opties zijn in een onjuist formaat geschreven."
 
 #. context.Updater.ModelState.AddModelError(Prefix, S["The options are written in an incorrect format."]);
 #: OrchardCore.ContentFields\Settings\TextFieldPredefinedListEditorSettingsDriver.cs:54
@@ -364,23 +364,23 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Omschakelen"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
-msgstr ""
+msgstr "Tip"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:8
@@ -388,11 +388,11 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "De hint tekst om weer te geven voor dit veld in de editor."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
-msgstr ""
+msgstr "Label"
 
 #. <span class="hint">@T["The text associated to the checkbox."]</span>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:16
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Geen inhoudsitems."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standaard"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Niet gepubliceerd"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Tekst om te zoeken"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Selecteer"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Geen resultaten gevonden"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,11 +486,11 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Of het is toegestaan dat er meerdere elementen mogen worden geselecteerd."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
-msgstr ""
+msgstr "Ingesloten Content Typen"
 
 #. @T["Display All Content Types"]
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:35
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Alle Inhoudstypes Weergeven"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -510,7 +510,7 @@ msgstr "Inhoudtypes"
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotype"
-msgstr ""
+msgstr "Stereotype"
 
 #. @T["Stereotype"] <span class="hint">@T["All content types of these Stereotypes"]</span>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:47
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "De inhoudstypes om weer te geven. Kies er ten minste één."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "De hint tekst om weer te geven voor dit veld in de editor."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "In eigen taal"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Of een waarde is vereist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "De hinttekst om weer te geven voor dit veld in de editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Of een waarde vereist is."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "WYSIWYG tekstverwerker"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentatie voor opties"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Linktekst"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Of de URL vereist is."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Gebruik de URL van de link"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "De hinttekst om weer te geven voor de URL in de editor."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "De hinttekst om weer te geven voor de tekst van de link in de editor."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Een hint om weer te geven als de URL leeg is."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Een hint om weer te geven als de tekst leeg is."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Een geldige URL voorgesteld bij het maken van een inhoudsitem."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Geen inhoudsitems."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Standaard"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Niet gepubliceerd"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Tekst om te zoeken"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Selecteer"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Geen resultaten gevonden"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Of het is toegestaan dat er meerdere elementen mogen worden geselecteerd."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "De inhoudstypes om weer te geven. Kies er ten minste één."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Bereik"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Geen"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Of een waarde vereist is."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "De hinttekst om weer te geven voor dit veld in de editor."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Een hint om weer te geven wanneer de invoer leeg is. (optioneel)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Het aantal cijfers na de decimaal."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "De toegestane minimumwaarde. (optioneel)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "De maximaal toegestane waarde. (optioneel)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Gegevens bewerken"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Een JSON weergave van de toegestane waarden, bijvoorbeeld {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Of een waarde is vereist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "De hinttekst om weer te geven voor dit veld in de editor."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Of een waarde is vereist."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Vereist"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Of een waarde is vereist."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "De hinttekst om weer te geven voor dit veld in de editor."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Breedte"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "De breedte van de Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Hoogte"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "De hoogte van de Videobox"
diff --git a/Localization/nl/OrchardCore.ContentLocalization.po b/Localization/nl/OrchardCore.ContentLocalization.po
index 8abb3086321da..47e5ec52d2674 100644
--- a/Localization/nl/OrchardCore.ContentLocalization.po
+++ b/Localization/nl/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/nl/OrchardCore.ContentManagement.GraphQL.po b/Localization/nl/OrchardCore.ContentManagement.GraphQL.po
index 039a44a32a422..22b88cdd25a8f 100644
--- a/Localization/nl/OrchardCore.ContentManagement.GraphQL.po
+++ b/Localization/nl/OrchardCore.ContentManagement.GraphQL.po
@@ -10,19 +10,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-17 16:33\n"
+"PO-Revision-Date: 2023-11-28 08:28\n"
 
 #. Description = S["Content items are instances of content types, just like objects are instances of classes."],
 #: OrchardCore.ContentManagement.GraphQL\Queries\ContentItemQuery.cs:34
 msgctxt "OrchardCore.ContentManagement.GraphQL.Queries.ContentItemQuery"
 msgid "Content items are instances of content types, just like objects are instances of classes."
-msgstr ""
+msgstr "Contentitems zijn instanties van inhoudstypen, net zoals objecten instanties van klassen zijn."
 
 #. Description = S["Content item id"]
 #: OrchardCore.ContentManagement.GraphQL\Queries\ContentItemQuery.cs:40
 msgctxt "OrchardCore.ContentManagement.GraphQL.Queries.ContentItemQuery"
 msgid "Content item id"
-msgstr ""
+msgstr "Content item id"
 
 #. Description = S["Represents a {0}.", typeDefinition.DisplayName]
 #. Description = S["Represents a {0}.", typeDefinition.DisplayName],
@@ -30,11 +30,11 @@ msgstr ""
 #: OrchardCore.ContentManagement.GraphQL\Queries\ContentTypeQuery.cs:66
 msgctxt "OrchardCore.ContentManagement.GraphQL.Queries.ContentTypeQuery"
 msgid "Represents a {0}."
-msgstr ""
+msgstr "Vertegenwoordigt een {0}."
 
 #. description: S["Represents a {0}.", part.PartDefinition.Name],
 #: OrchardCore.ContentManagement.GraphQL\Queries\Types\DynamicContentTypeBuilder.cs:114
 msgctxt "OrchardCore.ContentManagement.GraphQL.Queries.Types.DynamicContentTypeBuilder"
 msgid "Represents a {0}."
-msgstr ""
+msgstr "Vertegenwoordigt een {0}."
 
diff --git a/Localization/nl/OrchardCore.ContentPreview.po b/Localization/nl/OrchardCore.ContentPreview.po
index 9bd059bd334b8..ff7b8bc4bea05 100644
--- a/Localization/nl/OrchardCore.ContentPreview.po
+++ b/Localization/nl/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Patroon bevat geen geldige Liquid expressie. Details: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Voorbeeld"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Voorbeeld verbinding verbroken"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Fout bij het tonen van het voorbeeld"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/nl/OrchardCore.ContentTypes.po b/Localization/nl/OrchardCore.ContentTypes.po
index 6241cfd39065d..59c031547e6fd 100644
--- a/Localization/nl/OrchardCore.ContentTypes.po
+++ b/Localization/nl/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Bewerken"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Opslaan"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Annuleren"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Opslaan"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Annuleren"
diff --git a/Localization/nl/OrchardCore.Contents.po b/Localization/nl/OrchardCore.Contents.po
index 36c40937eb9b7..0a14f39893a94 100644
--- a/Localization/nl/OrchardCore.Contents.po
+++ b/Localization/nl/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Acties"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/nl/OrchardCore.CustomSettings.po b/Localization/nl/OrchardCore.CustomSettings.po
index e80a0a5ed486c..dba3b2d44171c 100644
--- a/Localization/nl/OrchardCore.CustomSettings.po
+++ b/Localization/nl/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Aangepaste instellingen"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/nl/OrchardCore.Data.YesSql.po b/Localization/nl/OrchardCore.Data.YesSql.po
index 5f895eecc6fc0..9b0dcdeffd72d 100644
--- a/Localization/nl/OrchardCore.Data.YesSql.po
+++ b/Localization/nl/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Demo.po b/Localization/nl/OrchardCore.Demo.po
index 012cb38d0a45c..b28dd36a683f8 100644
--- a/Localization/nl/OrchardCore.Demo.po
+++ b/Localization/nl/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Voornaam"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Achternaam"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/nl/OrchardCore.Deployment.Remote.po b/Localization/nl/OrchardCore.Deployment.Remote.po
index 7acbcf5a824a3..bf03cacbf7fd4 100644
--- a/Localization/nl/OrchardCore.Deployment.Remote.po
+++ b/Localization/nl/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/nl/OrchardCore.Deployment.po b/Localization/nl/OrchardCore.Deployment.po
index 63ca3ec452873..6970920b0d361 100644
--- a/Localization/nl/OrchardCore.Deployment.po
+++ b/Localization/nl/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON importeren"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/nl/OrchardCore.Diagnostics.po b/Localization/nl/OrchardCore.Diagnostics.po
index f35d021b98c70..79f593a34b507 100644
--- a/Localization/nl/OrchardCore.Diagnostics.po
+++ b/Localization/nl/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Uw browser heeft een verzoek verzonden dat deze server niet kon begrijpen."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Er is een fout opgetreden tijdens het uitvoeren van dit verzoek."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "U hebt geen toegang tot deze resource."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "De pagina werd niet gevonden."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "U bent niet bevoegd om deze inhoud te bekijken."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/nl/OrchardCore.Email.Abstractions.po b/Localization/nl/OrchardCore.Email.Abstractions.po
index 023ad00c37966..00be91537a08f 100644
--- a/Localization/nl/OrchardCore.Email.Abstractions.po
+++ b/Localization/nl/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Het {0} veld is verplicht."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "De verzendmethode '{0}' wordt niet ondersteund."
diff --git a/Localization/nl/OrchardCore.Email.po b/Localization/nl/OrchardCore.Email.po
index 59a5bb6bc5070..9322303c58b3e 100644
--- a/Localization/nl/OrchardCore.Email.po
+++ b/Localization/nl/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Instellingen"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Onderwerp"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "De SMTP-serverpoort, meestal 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/nl/OrchardCore.Facebook.po b/Localization/nl/OrchardCore.Facebook.po
index 2471975646ac6..48a8dc7a28952 100644
--- a/Localization/nl/OrchardCore.Facebook.po
+++ b/Localization/nl/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/nl/OrchardCore.Features.po b/Localization/nl/OrchardCore.Features.po
index eb87746da9ed0..1f30ff13a3a3e 100644
--- a/Localization/nl/OrchardCore.Features.po
+++ b/Localization/nl/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Uitschakelen"
@@ -136,8 +136,8 @@ msgstr "Uitschakelen"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Inschakelen"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Ja"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Nee"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Flows.po b/Localization/nl/OrchardCore.Flows.po
index dfe3fd19bcbb2..df898a4922439 100644
--- a/Localization/nl/OrchardCore.Flows.po
+++ b/Localization/nl/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/nl/OrchardCore.Forms.po b/Localization/nl/OrchardCore.Forms.po
index 5f351c3b40250..4a0d237ccc46a 100644
--- a/Localization/nl/OrchardCore.Forms.po
+++ b/Localization/nl/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validatie"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validatie"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validatie"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Geldig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Ongeldig"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validatie"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Geldig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Ongeldig"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validatie"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Geldig"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Ongeldig"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/nl/OrchardCore.GitHub.po b/Localization/nl/OrchardCore.GitHub.po
index 271ec6311d041..87ebd74a737c3 100644
--- a/Localization/nl/OrchardCore.GitHub.po
+++ b/Localization/nl/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/nl/OrchardCore.Google.po b/Localization/nl/OrchardCore.Google.po
index 8b252cc10511d..640f501e670dd 100644
--- a/Localization/nl/OrchardCore.Google.po
+++ b/Localization/nl/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Google Analytics Instellingen"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/nl/OrchardCore.Html.po b/Localization/nl/OrchardCore.Html.po
index eb1555c80a6ae..b104fee7746a7 100644
--- a/Localization/nl/OrchardCore.Html.po
+++ b/Localization/nl/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Https.po b/Localization/nl/OrchardCore.Https.po
index d237b34435076..65bbbc54b88b5 100644
--- a/Localization/nl/OrchardCore.Https.po
+++ b/Localization/nl/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Geeft aan of een permanente doorverwijzing, 308 permanent verplaatst, gebruikt moet worden in plaats van een tijdelijke omleiding, 307 Gevonden, wanneer doorverwezen naar HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/nl/OrchardCore.Infrastructure.Abstractions.po b/Localization/nl/OrchardCore.Infrastructure.Abstractions.po
index 28efa5fe157cd..6a2d4d992f789 100644
--- a/Localization/nl/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/nl/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/nl/OrchardCore.Layers.po b/Localization/nl/OrchardCore.Layers.po
index bc47d1d580695..cd9f370de003d 100644
--- a/Localization/nl/OrchardCore.Layers.po
+++ b/Localization/nl/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/nl/OrchardCore.Liquid.po b/Localization/nl/OrchardCore.Liquid.po
index 9dcc5c1918ca7..e1d14a7865488 100644
--- a/Localization/nl/OrchardCore.Liquid.po
+++ b/Localization/nl/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/nl/OrchardCore.Lists.po b/Localization/nl/OrchardCore.Lists.po
index 543e3f549e362..c01af41bbd849 100644
--- a/Localization/nl/OrchardCore.Lists.po
+++ b/Localization/nl/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/nl/OrchardCore.Localization.po b/Localization/nl/OrchardCore.Localization.po
index 6d832676c3858..7fb90e4dceaa5 100644
--- a/Localization/nl/OrchardCore.Localization.po
+++ b/Localization/nl/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/nl/OrchardCore.Markdown.po b/Localization/nl/OrchardCore.Markdown.po
index 04d5e2ff4e255..f33150bcef757 100644
--- a/Localization/nl/OrchardCore.Markdown.po
+++ b/Localization/nl/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/nl/OrchardCore.Media.po b/Localization/nl/OrchardCore.Media.po
index 97c160a99b829..f7521bf380483 100644
--- a/Localization/nl/OrchardCore.Media.po
+++ b/Localization/nl/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Kan media niet verplaatsen omdat een bestand met dezelfde naam reeds bestaat"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Een profiel met dezelfde naam bestaat reeds."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Het media-profiel werd succesvol verwijderd."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "De media-profielen werden succesvol verwijderd."
@@ -181,95 +181,95 @@ msgstr "De media-profielen werden succesvol verwijderd."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Standaard"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Aangepaste grootte"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Standaard (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Bijsnijden"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Uitrekken"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "De naam van het media-profiel."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "De hint voor het media-profiel."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Selecteer de breedte voor de verwerkte afbeelding. Een standaardwaarde betekent dat een breedte-opdracht niet zal worden toegepast."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Selecteer de hoogte voor de verwerkte afbeelding. Een standaardwaarde betekent dat een hoogte-opdracht niet zal worden toegepast."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Kies een formaat modus voor het verwerken van de afbeelding."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Selecteer de achtergrondkleur voor de verwerkte afbeelding. Een lege waarde betekent dat een achtergrondkleur-opdracht niet zal worden toegepast. Voorbeelden van geldige waarden: 'white', 'ffff00', 'ffff0080', '128,64,32' en '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Selecteer het formaat voor de verwerkte afbeelding. Een standaardwaarde betekent dat een format-opdracht niet zal worden toegepast."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Media-profiel bewerken"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "De naam van het media-profiel."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "De hint voor het media-profiel."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Selecteer de breedte voor de verwerkte afbeelding. Een standaardwaarde betekent dat een breedte-opdracht niet zal worden toegepast."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Selecteer de hoogte voor de verwerkte afbeelding. Een standaardwaarde betekent dat een hoogte-opdracht niet zal worden toegepast."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Kies een formaat modus voor het verwerken van de afbeelding."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Selecteer de achtergrondkleur voor de verwerkte afbeelding. Een lege waarde betekent dat een achtergrondkleur-opdracht niet zal worden toegepast. Voorbeelden van geldige waarden: 'white', 'ffff00', 'ffff0080', '128,64,32' en '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Selecteer het formaat voor de verwerkte afbeelding. Een standaardwaarde betekent dat een format-opdracht niet zal worden toegepast."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Omkeren"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Item hernoemen"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alle"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Kleine miniaturen"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Grote miniaturen"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Kleine miniaturen"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Grote miniaturen"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Selecteer media"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Ok"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Of het selecteren van een ankerpunt voor het aanpassen van de grootte is toegestaan."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/nl/OrchardCore.Menu.po b/Localization/nl/OrchardCore.Menu.po
index ef1580d6d2a6a..1f29946d07264 100644
--- a/Localization/nl/OrchardCore.Menu.po
+++ b/Localization/nl/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menu's"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/nl/OrchardCore.Microsoft.Authentication.po b/Localization/nl/OrchardCore.Microsoft.Authentication.po
index d00d31c4f9453..84395571fdc77 100644
--- a/Localization/nl/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/nl/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/nl/OrchardCore.Navigation.po b/Localization/nl/OrchardCore.Navigation.po
index b45dcd74cd5ee..036faaee8c189 100644
--- a/Localization/nl/OrchardCore.Navigation.po
+++ b/Localization/nl/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Notifications.po b/Localization/nl/OrchardCore.Notifications.po
index eafd6141f89e9..c6499f056f1d7 100644
--- a/Localization/nl/OrchardCore.Notifications.po
+++ b/Localization/nl/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/nl/OrchardCore.OpenId.po b/Localization/nl/OrchardCore.OpenId.po
index 85a962fafc520..eb0cc1d503f00 100644
--- a/Localization/nl/OrchardCore.OpenId.po
+++ b/Localization/nl/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/nl/OrchardCore.Placements.po b/Localization/nl/OrchardCore.Placements.po
index 257ebd9026347..909e237b827ea 100644
--- a/Localization/nl/OrchardCore.Placements.po
+++ b/Localization/nl/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/nl/OrchardCore.ProjectTemplates.po b/Localization/nl/OrchardCore.ProjectTemplates.po
index 97c9470b8883b..13e7447012c76 100644
--- a/Localization/nl/OrchardCore.ProjectTemplates.po
+++ b/Localization/nl/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Toon"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/nl/OrchardCore.PublishLater.po b/Localization/nl/OrchardCore.PublishLater.po
index e836a9460879c..e192e8e453caf 100644
--- a/Localization/nl/OrchardCore.PublishLater.po
+++ b/Localization/nl/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publiceer later"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Publiceer later annuleren"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/nl/OrchardCore.Queries.po b/Localization/nl/OrchardCore.Queries.po
index 79c4a247ee3c9..30203a548a1c6 100644
--- a/Localization/nl/OrchardCore.Queries.po
+++ b/Localization/nl/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/nl/OrchardCore.ReCaptcha.Core.po b/Localization/nl/OrchardCore.ReCaptcha.Core.po
index 0a41d64273aff..f374921eedc67 100644
--- a/Localization/nl/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/nl/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Kon captcha niet valideren"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Kon captcha niet valideren"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Taal met de naam {0} niet gevonden"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/nl/OrchardCore.ReCaptcha.po b/Localization/nl/OrchardCore.ReCaptcha.po
index 9d3f16422af2f..e4ed60b34826b 100644
--- a/Localization/nl/OrchardCore.ReCaptcha.po
+++ b/Localization/nl/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Exporteert de ReCaptcha instellingen."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validatie"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/nl/OrchardCore.Recipes.Core.po b/Localization/nl/OrchardCore.Recipes.Core.po
index fac7dc383f32f..c6acce28e37ba 100644
--- a/Localization/nl/OrchardCore.Recipes.Core.po
+++ b/Localization/nl/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/nl/OrchardCore.Roles.po b/Localization/nl/OrchardCore.Roles.po
index 43c9905bc05c5..823d228be18bb 100644
--- a/Localization/nl/OrchardCore.Roles.po
+++ b/Localization/nl/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Rollen"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Rol naam"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Annuleren"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Rollen"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/nl/OrchardCore.Rules.po b/Localization/nl/OrchardCore.Rules.po
index 56d9d44c0406b..88c0723f45793 100644
--- a/Localization/nl/OrchardCore.Rules.po
+++ b/Localization/nl/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/nl/OrchardCore.Search.Elasticsearch.po b/Localization/nl/OrchardCore.Search.Elasticsearch.po
index 08ecb665faf33..55a024a28047c 100644
--- a/Localization/nl/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/nl/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/nl/OrchardCore.Search.Lucene.po b/Localization/nl/OrchardCore.Search.Lucene.po
index b82ddad3f5c95..d87260912a282 100644
--- a/Localization/nl/OrchardCore.Search.Lucene.po
+++ b/Localization/nl/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Search.po b/Localization/nl/OrchardCore.Search.po
index d5c28314b36ef..910b29e377209 100644
--- a/Localization/nl/OrchardCore.Search.po
+++ b/Localization/nl/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/nl/OrchardCore.Security.po b/Localization/nl/OrchardCore.Security.po
index 4f00a25f1bf7f..c650b038066aa 100644
--- a/Localization/nl/OrchardCore.Security.po
+++ b/Localization/nl/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/nl/OrchardCore.Seo.po b/Localization/nl/OrchardCore.Seo.po
index 8a6d6fc14c392..77931c34f710b 100644
--- a/Localization/nl/OrchardCore.Seo.po
+++ b/Localization/nl/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/nl/OrchardCore.Settings.po b/Localization/nl/OrchardCore.Settings.po
index c90c350377f49..87ba03cb2da16 100644
--- a/Localization/nl/OrchardCore.Settings.po
+++ b/Localization/nl/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/nl/OrchardCore.Setup.Core.po b/Localization/nl/OrchardCore.Setup.Core.po
index 67f74c7ecf7b0..fa466176c9a6e 100644
--- a/Localization/nl/OrchardCore.Setup.Core.po
+++ b/Localization/nl/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/nl/OrchardCore.Setup.po b/Localization/nl/OrchardCore.Setup.po
index b06a12cc527b4..7773907a60af4 100644
--- a/Localization/nl/OrchardCore.Setup.po
+++ b/Localization/nl/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Wachtwoord moet tenminste {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Het is niet mogelijk een website op te zetten zonder een recept."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Dit wordt gebruikt als de standaard titel van uw pagina's."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Recepten stellen je in staat van meet af aan een website op te zetten met additionele, kant-en-klare, vooraf geconfigureerde opties, functies en instellingen."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Bepaalt de standaard tijdzone die wordt gebruikt voor het weergeven en bewerken van datum- en tijdvelden."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "De database wordt gebruikt om de configuratie en de inhoud van de website op te slaan."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Je kunt een tabelvoorvoegsel opgeven als je van plan bent dezelfde database voor meerdere websites te hergebruiken."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Connectiestring tonen/verbergen"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "De supergebruiker heeft alle rechten. Het moet alleen worden gebruikt tijdens installeren en voor rampherstel."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Dit e-mailadres is onjuist."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Wachtwoordsterkte"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/nl/OrchardCore.Shortcodes.po b/Localization/nl/OrchardCore.Shortcodes.po
index 8a5f689fdd221..068a276c0a41a 100644
--- a/Localization/nl/OrchardCore.Shortcodes.po
+++ b/Localization/nl/OrchardCore.Shortcodes.po
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
 msgctxt "OrchardCore.Shortcodes.AdminMenu"
 msgid "Design"
-msgstr ""
+msgstr "Design"
 
 #. .Add(S["Shortcodes"], S["Shortcodes"].PrefixPosition(), import => import
 #. .Add(S["Shortcodes"], S["Shortcodes"].PrefixPosition(), import => import
@@ -24,13 +24,13 @@ msgstr ""
 #: OrchardCore.Shortcodes\AdminMenu.cs:26
 msgctxt "OrchardCore.Shortcodes.AdminMenu"
 msgid "Shortcodes"
-msgstr ""
+msgstr "Shortcodes"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:96
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name is mandatory."]);
@@ -38,7 +38,7 @@ msgstr ""
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:234
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The name is mandatory."
-msgstr ""
+msgstr "De naam is verplicht."
 
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name contains invalid characters."]);
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name contains invalid characters."]);
@@ -46,7 +46,7 @@ msgstr ""
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The name contains invalid characters."
-msgstr ""
+msgstr "De naam bevat ongeldige karakters."
 
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["A template with the same name already exists."]);
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["A template with the same name already exists."]);
@@ -54,7 +54,7 @@ msgstr ""
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "A template with the same name already exists."
-msgstr ""
+msgstr "Er bestaat al een sjabloon met dezelfde naam."
 
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template content is mandatory."]);
 #. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template content is mandatory."]);
@@ -62,129 +62,129 @@ msgstr ""
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:248
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
-msgstr ""
+msgstr "De sjablooninhoud is verplicht."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
-msgstr ""
+msgstr "De sjabloon bevat geen geldige Liquid-expressie. Details: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
-msgstr ""
+msgstr "Shortcodesjabloon is succesvol verwijderd."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
-msgstr ""
+msgstr "Shortcode-sjablonen zijn succesvol verwijderd."
 
 #. <h5>@T["All Shortcode Templates"]</h5>
 #: OrchardCore.Shortcodes\Views\Items\AllShortcodeTemplatesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Shortcodes.Views.Items.AllShortcodeTemplatesDeploymentStep.Edit"
 msgid "All Shortcode Templates"
-msgstr ""
+msgstr "Alle shortcode-sjablonen"
 
 #. <h5>@T["All Shortcode Templates"]</h5>
 #: OrchardCore.Shortcodes\Views\Items\AllShortcodeTemplatesDeploymentStep.Summary.cshtml:3
 msgctxt "OrchardCore.Shortcodes.Views.Items.AllShortcodeTemplatesDeploymentStep.Summary"
 msgid "All Shortcode Templates"
-msgstr ""
+msgstr "Alle shortcode-sjablonen"
 
 #. <span class="hint">@T["Adds all shortcode templates to the plan."]</span>
 #: OrchardCore.Shortcodes\Views\Items\AllShortcodeTemplatesDeploymentStep.Summary.cshtml:5
 msgctxt "OrchardCore.Shortcodes.Views.Items.AllShortcodeTemplatesDeploymentStep.Summary"
 msgid "Adds all shortcode templates to the plan."
-msgstr ""
+msgstr "Voegt alle shortcode-sjablonen toe aan het plan."
 
 #. <h4 class="card-title">@T["All Shortcode Templates"]</h4>
 #: OrchardCore.Shortcodes\Views\Items\AllShortcodeTemplatesDeploymentStep.Thumbnail.cshtml:3
 msgctxt "OrchardCore.Shortcodes.Views.Items.AllShortcodeTemplatesDeploymentStep.Thumbnail"
 msgid "All Shortcode Templates"
-msgstr ""
+msgstr "Alle shortcode-sjablonen"
 
 #. <p>@T["Exports all shortcode templates."]</p>
 #: OrchardCore.Shortcodes\Views\Items\AllShortcodeTemplatesDeploymentStep.Thumbnail.cshtml:4
 msgctxt "OrchardCore.Shortcodes.Views.Items.AllShortcodeTemplatesDeploymentStep.Thumbnail"
 msgid "Exports all shortcode templates."
-msgstr ""
+msgstr "Exporteert alle shortcode-sjablonen."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Create Shortcode"])</h1></zone>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:37
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
-msgstr ""
+msgstr "Maak een shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. <span class="hint">@T["The name of the shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:47
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
-msgstr ""
+msgstr "De naam van de shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
-msgstr ""
+msgstr "Tip"
 
 #. <span class="hint">@T["The hint for the shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:53
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
-msgstr ""
+msgstr "De tip voor de shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
-msgstr ""
+msgstr "Gebruik"
 
 #. <span class="hint">@T["Example usage of the shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:59
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
-msgstr ""
+msgstr "Voorbeeldgebruik van de shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
-msgstr ""
+msgstr "Categorie"
 
 #. placeholder="@T["Type to search"]"
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Type to search"
-msgstr ""
+msgstr "Typ om te zoeken"
 
 #. select-label="@T["Select"]"
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:68
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Select"
-msgstr ""
+msgstr "Selecteer"
 
 #. deselect-label="@T["Remove"]"
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:69
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Remove"
-msgstr ""
+msgstr "Verwijderen"
 
 #. tag-placeholder="@T["Press enter to add a category"]"
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:77
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Press enter to add a category"
-msgstr ""
+msgstr "Druk op enter om een categorie toe te voegen"
 
 #. @T["No categories found"]
 #. @T["No categories found"]
@@ -192,133 +192,133 @@ msgstr ""
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:83
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "No categories found"
-msgstr ""
+msgstr "Geen categorieën gevonden"
 
 #. <span class="hint">@T["The categories for this shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:86
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
-msgstr ""
+msgstr "De categorieën voor deze shortcode."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
-msgstr ""
+msgstr "Standaard Shortcode waarde"
 
 #. <span class="hint">@T["The default value of the shortcode when selected. Defaults to [name]."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:92
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
-msgstr ""
+msgstr "De standaardwaarde van de shortcode wanneer geselecteerd. Standaard ingesteld op [name]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
-msgstr ""
+msgstr "Inhoud"
 
 #. <span class="hint">@T["The Shortcode Liquid template."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:110
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The Shortcode Liquid template."
-msgstr ""
+msgstr "De Shortcode Liquid-sjabloon."
 
 #. <button type="submit" name="submit" class="btn btn-primary save">@T["Save"]</button>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:117
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 #. <span class="visually-hidden">@T["Toggle Dropdown"]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:119
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Toggle Dropdown"
-msgstr ""
+msgstr "Omschakelen Dropdown"
 
 #. <button class="dropdown-item save-continue" name="submit" type="submit" value="SaveAndContinue">@T["and continue"]</button>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:122
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "and continue"
-msgstr ""
+msgstr "en ga verder"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Index">@T["Cancel"]</a>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:126
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Shortcode"])</h1></zone>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
-msgstr ""
+msgstr "Wijzig shortcode"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. <span class="hint">@T["The name of the shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
-msgstr ""
+msgstr "De naam van de shortcode."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
-msgstr ""
+msgstr "Tip"
 
 #. <span class="hint">@T["The hint for the shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:56
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
-msgstr ""
+msgstr "De tip voor de shortcode."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
-msgstr ""
+msgstr "Gebruik"
 
 #. <span class="hint">@T["Example usage of the shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:62
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
-msgstr ""
+msgstr "Voorbeeldgebruik van de shortcode."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
-msgstr ""
+msgstr "Categorieën"
 
 #. placeholder="@T["Type to search"]"
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:70
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Type to search"
-msgstr ""
+msgstr "Typ om te zoeken"
 
 #. select-label="@T["Select"]"
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:71
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Select"
-msgstr ""
+msgstr "Selecteer"
 
 #. deselect-label="@T["Remove"]"
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:72
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Remove"
-msgstr ""
+msgstr "Verwijderen"
 
 #. tag-placeholder="@T["Press enter to add a category"]"
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:80
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Press enter to add a category"
-msgstr ""
+msgstr "Druk op enter om een categorie toe te voegen"
 
 #. @T["No categories found"]
 #. @T["No categories found"]
@@ -326,7 +326,7 @@ msgstr ""
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:86
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "No categories found"
-msgstr ""
+msgstr "Geen categorieën gevonden"
 
 #. <span class="hint">@T["The categories for this shortcode."]</span>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:89
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/nl/OrchardCore.Sitemaps.po b/Localization/nl/OrchardCore.Sitemaps.po
index ec2ff63b36419..9b872bd94c253 100644
--- a/Localization/nl/OrchardCore.Sitemaps.po
+++ b/Localization/nl/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Naam"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/nl/OrchardCore.Sms.po b/Localization/nl/OrchardCore.Sms.po
index c30ac31b42f6c..d9cbcc2430f83 100644
--- a/Localization/nl/OrchardCore.Sms.po
+++ b/Localization/nl/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/nl/OrchardCore.Spatial.po b/Localization/nl/OrchardCore.Spatial.po
index d9e99c8332822..7f6393a989cc3 100644
--- a/Localization/nl/OrchardCore.Spatial.po
+++ b/Localization/nl/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/nl/OrchardCore.Taxonomies.po b/Localization/nl/OrchardCore.Taxonomies.po
index b1b18af5ad514..693de14020e9b 100644
--- a/Localization/nl/OrchardCore.Taxonomies.po
+++ b/Localization/nl/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Vereist"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Templates.Cms.Module.po b/Localization/nl/OrchardCore.Templates.Cms.Module.po
index 41303637c0225..80fe85eba8ed8 100644
--- a/Localization/nl/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/nl/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Weergeven"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/nl/OrchardCore.Templates.po b/Localization/nl/OrchardCore.Templates.po
index 09b9d0b68f44b..35b2a66c782e0 100644
--- a/Localization/nl/OrchardCore.Templates.po
+++ b/Localization/nl/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/nl/OrchardCore.Tenants.po b/Localization/nl/OrchardCore.Tenants.po
index e31b970959b86..cccf5d46079c7 100644
--- a/Localization/nl/OrchardCore.Tenants.po
+++ b/Localization/nl/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Naam"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Uitschakelen"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Inschakelen"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/nl/OrchardCore.Tests.po b/Localization/nl/OrchardCore.Tests.po
index 9f66a03cb0ad1..42ec1732af811 100644
--- a/Localization/nl/OrchardCore.Tests.po
+++ b/Localization/nl/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/nl/OrchardCore.Themes.po b/Localization/nl/OrchardCore.Themes.po
index fc68d64837cc3..313a788d85717 100644
--- a/Localization/nl/OrchardCore.Themes.po
+++ b/Localization/nl/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exporteer het huidige geselecteerde thema en het Admin thema."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/nl/OrchardCore.Title.po b/Localization/nl/OrchardCore.Title.po
index 0a4521d11aa03..21ef2a7f8155f 100644
--- a/Localization/nl/OrchardCore.Title.po
+++ b/Localization/nl/OrchardCore.Title.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
 msgctxt "OrchardCore.Title.Drivers.TitlePartDisplayDriver"
 msgid "A value is required for Title."
-msgstr ""
+msgstr "Een waarde is vereist voor Titel."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
-msgstr ""
+msgstr "Een waarde is vereist voor Titel."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Patroon bevat geen geldige Liquid expressie. Details: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -46,21 +46,21 @@ msgstr "Titel"
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:22
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Leave empty to auto-generate the title using the pattern."
-msgstr ""
+msgstr "Laat dit leeg om de titel automatisch te genereren met behulp van het patroon."
 
 #. <span class="hint">@T["The title will be auto-generated using the pattern."]</span>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:25
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
-msgstr ""
+msgstr "De titel wordt automatisch gegenereerd op basis van het patroon."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Standaard"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -70,39 +70,39 @@ msgstr "Opties"
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Title is editable"
-msgstr ""
+msgstr "Titel is bewerkbaar"
 
 #. <option value="@TitlePartOptions.EditableRequired" selected="@(Model.Options == TitlePartOptions.EditableRequired)">@T["Title is editable and required"]</option>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Title is editable and required"
-msgstr ""
+msgstr "Titel is bewerkbaar en vereist"
 
 #. <option value="@TitlePartOptions.GeneratedDisabled" selected="@(Model.Options == TitlePartOptions.GeneratedDisabled)">@T["Title is generated and input is disabled"]</option>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:20
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Title is generated and input is disabled"
-msgstr ""
+msgstr "Titel wordt gegenereerd en invoer is uitgeschakeld"
 
 #. <option value="@TitlePartOptions.GeneratedHidden" selected="@(Model.Options == TitlePartOptions.GeneratedHidden)">@T["Title is generated and input is hidden"]</option>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Title is generated and input is hidden"
-msgstr ""
+msgstr "Titel wordt gegenereerd en invoer wordt verborgen"
 
 #. <label asp-for="RenderTitle" class="form-check-label">@T["Render Title"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Render Title"
-msgstr ""
+msgstr "Geef titel weer"
 
 #. <span class="hint dashed">@T["Check to render the title in display views."]</span>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:29
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
-msgstr ""
+msgstr "Vink dit aan om de titel in weergaveweergaven weer te geven."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
@@ -112,5 +112,5 @@ msgstr "Patroon"
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "The pattern used to render the title of this content type. With Liquid support."
-msgstr ""
+msgstr "Het patroon dat wordt gebruikt om de titel van dit inhoudstype weer te geven. Met Liquide ondersteuning."
 
diff --git a/Localization/nl/OrchardCore.Twitter.po b/Localization/nl/OrchardCore.Twitter.po
index 16724e64f738d..7bb91056a79ba 100644
--- a/Localization/nl/OrchardCore.Twitter.po
+++ b/Localization/nl/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/nl/OrchardCore.Users.Core.po b/Localization/nl/OrchardCore.Users.Core.po
index 97d6e95af0c78..b62fefae68714 100644
--- a/Localization/nl/OrchardCore.Users.Core.po
+++ b/Localization/nl/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-mail '{0}' is ongeldig."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Onverwachte fout: '{0}'."
diff --git a/Localization/nl/OrchardCore.Users.po b/Localization/nl/OrchardCore.Users.po
index f8d9cbba73c9f..b200d22c8e734 100644
--- a/Localization/nl/OrchardCore.Users.po
+++ b/Localization/nl/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Gebruiker succesvol aangemaakt"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Lokale login is uitgeschakeld."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Het account is geblokkeerd"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Ongeldige inlogpoging."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Uw wachtwoord is met succes gewijzigd."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Er is een fout opgetreden in de externe provider."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Site staat registratie van gebruikers niet toe."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Bevestig uw account"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "De opgegeven gebruiker mag zich niet aanmelden."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "U moet uw e-mailadres bevestigen."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Alle gebruikers"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Ingeschakelde gebruikers"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Uitgeschakelde gebruikers"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Naam"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "E-mail"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Goedkeuren"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Inschakelen"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Uitschakelen"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Alle rollen"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Geverifieerd (geen rollen)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Gebruiker {0} is goedgekeurd."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Gebruiker {0} succesvol verwijderd."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Gebruiker {0} succesvol uitgeschakeld."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Gebruiker {0} inschakelen geslaagd."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Gebruiker met succes aangemaakt."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Gebruiker met succes bijgewerkt."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Gebruiker met succes verwijderd."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "De gebruiker kon niet worden verwijderd."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Wachtwoord correct bijgewerkt."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Gebruiker is succesvol ontgrendeld."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Kon de gebruiker niet ontgrendelen."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Inloginstellingen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exporteer de logininstellingen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "E-mailinstellingen wijzigen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exporteer de gewijzigde e-mailinstellingen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Registratie instellingen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exporteer de registratie-instellingen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Reset Wachtwoord instellingen"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exporteer de registratie-instellingen."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Het nieuwe wachtwoord en het bevestigingswachtwoord komen niet overeen."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Gebruikersrol taak toewijzen"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Gebruiker"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Voltooid"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Mislukt"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Registreer gebruikerstaak"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Gebruiker"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Voltooid"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Geldig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Ongeldig"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Geen e-mailservice beschikbaar"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Gebruiker Bijgewerkt Event"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Gebruiker"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Gebruikerstaak valideren"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anoniem"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Geverifieerd"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Inrol"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Een waarde is vereist voor {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} naar rol {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "De gebruiker om toe te wijzen. Met Liquid ondersteuning."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Gebruiker aanmaken"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Wachtwoord wijzigen"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nieuw Wachtwoord"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Controleer uw e-mail om uw wachtwoord opnieuw in te stellen."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "E-mailadres wijzigen"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Je bent met succes geverifieerd met <strong>{0}</strong>. Je hebt al een account met dit e-mailadres. Voer het wachtwoord van je lokale account in en klik op de knop Registreren om de accounts te koppelen en af te ronden met inloggen."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "E-mailadres"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Gebruik een andere dienst om in te loggen"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Log in met uw {0} account"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Maak een nieuw account aan."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "E-mailadres"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "U bent met succes geverifieerd met <strong>{0}</strong>. Vul het onderstaande formulier in en klik op de knop Registreren om de registratie te voltooien."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "E-mailadres"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Stuur bevestigingsmail"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Het onderwerp van het bericht. Ondersteunt de Liquid syntax."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Startpagina"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Wachtwoord opnieuw instellen"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "E-mailadres"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Gebruiker is uitgeschakeld."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Gebruiker is ingeschakeld."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Deselecteer om dit gebruikersaccount uit te schakelen."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Stel de 'Gebruikersnaam' workfloweigenschap in als de gebruiker is geverifieerd"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Rollen"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Het resultaat 'InRole' zal worden geactiveerd als de gebruiker ten minste één van de geselecteerde rollen heeft."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/nl/OrchardCore.Widgets.po b/Localization/nl/OrchardCore.Widgets.po
index 2fa1188cde922..8ea744598a933 100644
--- a/Localization/nl/OrchardCore.Widgets.po
+++ b/Localization/nl/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Voeg een Widget toe"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/nl/OrchardCore.Workflows.po b/Localization/nl/OrchardCore.Workflows.po
index af680db904ac2..76649111caa97 100644
--- a/Localization/nl/OrchardCore.Workflows.po
+++ b/Localization/nl/OrchardCore.Workflows.po
@@ -10,175 +10,175 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
-msgstr ""
+msgstr "Commit transactie taak"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
-msgstr ""
+msgstr "Sessie"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
-msgstr ""
+msgstr "Geldig"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
-msgstr ""
+msgstr "Ongeldig"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
-msgstr ""
+msgstr "Correlatie Taak"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
-msgstr ""
+msgstr "Primitieven"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
-msgstr ""
+msgstr "Voltooid"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
-msgstr ""
+msgstr "Voor elke taak"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
-msgstr ""
+msgstr "Stroom besturen"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
-msgstr ""
+msgstr "Iterate"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
-msgstr ""
+msgstr "Voltooid"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
-msgstr ""
+msgstr "Waar"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
-msgstr ""
+msgstr "Onwaar"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
-msgstr ""
+msgstr "Taak samenvoegen"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
-msgstr ""
+msgstr "Voltooid"
 
 #. public override LocalizedString DisplayText => S["Missing Activity"];
 #: OrchardCore.Workflows\Activities\MissingActivity.cs:26
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -286,7 +286,7 @@ msgstr ""
 #: OrchardCore.Workflows\AdminMenu.cs:24
 msgctxt "OrchardCore.Workflows.AdminMenu"
 msgid "Workflows"
-msgstr ""
+msgstr "Workflows"
 
 #. await _notifier.SuccessAsync(H["Activity added successfully."]);
 #: OrchardCore.Workflows\Controllers\ActivityController.cs:112
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/nl/TheAdmin.po b/Localization/nl/TheAdmin.po
index 8825ac8ccb743..ca23e714f9568 100644
--- a/Localization/nl/TheAdmin.po
+++ b/Localization/nl/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Lichte modus"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Donkere modus"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Bezoek Site"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Menu inklappen / uitklappen"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Weet u zeker dat u dit element wilt verwijderen?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
-msgstr ""
+msgstr "Oke"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Annuleren"
@@ -70,31 +48,57 @@ msgstr "Annuleren"
 #: TheAdmin\Views\Navigation-admin.cshtml:16
 msgctxt "TheAdmin.Views.Navigation-admin"
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #: TheAdmin\Views\Pager_First.cshtml:0
 msgctxt "TheAdmin.Views.Pager_First"
 msgid "Go to first page."
-msgstr ""
+msgstr "Ga naar de eerste pagina."
 
 #: TheAdmin\Views\Pager_Last.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Last"
 msgid "Go to last page."
-msgstr ""
+msgstr "Ga naar de laatste pagina."
 
 #: TheAdmin\Views\Pager_Next.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Next"
 msgid "Go to next page."
-msgstr ""
+msgstr "Ga naar de volgende pagina."
 
 #: TheAdmin\Views\Pager_Previous.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Previous"
 msgid "Go to previous page."
-msgstr ""
+msgstr "Ga naar de vorige pagina."
 
 #. <nav aria-label="@T["Listing pages"]">
 #: TheAdmin\Views\Pager.cshtml:6
 msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
+msgstr "Lijstpagina's"
+
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
 msgstr ""
 
diff --git a/Localization/nl/TheAgencyTheme.po b/Localization/nl/TheAgencyTheme.po
index c088fbcfbe8c4..179e14c3dd8d2 100644
--- a/Localization/nl/TheAgencyTheme.po
+++ b/Localization/nl/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Er zijn geen resultaten."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "De opgevraagde pagina kan niet worden gevonden."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/nl/TheBlogTheme.po b/Localization/nl/TheBlogTheme.po
index 68b0370b9a156..9383d4e40b282 100644
--- a/Localization/nl/TheBlogTheme.po
+++ b/Localization/nl/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-02-18 20:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "op {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Er zijn geen resultaten."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Pagina niet gevonden"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/nl/TheTheme.po b/Localization/nl/TheTheme.po
index 4603a1256074a..b0a99ac002e30 100644
--- a/Localization/nl/TheTheme.po
+++ b/Localization/nl/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/pl/OrchardCore.Admin.po b/Localization/pl/OrchardCore.Admin.po
index db482947dd8c9..63ad16f9f074f 100644
--- a/Localization/pl/OrchardCore.Admin.po
+++ b/Localization/pl/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Admin"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Ustawienia admina"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Eksport ustawień admina."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Witamy w Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Zapraszamy do przeglądania menu oraz odkrywania wszystkich możliwości."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Włącz ciemny motyw admina"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Czy można użyć ciemnego motywu admina."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Czy tytuły są wyświetlane na górnym pasku."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/pl/OrchardCore.AdminDashboard.po b/Localization/pl/OrchardCore.AdminDashboard.po
index 6f68288225178..f77b179148383 100644
--- a/Localization/pl/OrchardCore.AdminDashboard.po
+++ b/Localization/pl/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Nie"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Pozycja"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Szerokość"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/pl/OrchardCore.AdminMenu.po b/Localization/pl/OrchardCore.AdminMenu.po
index eab3b02a377fa..43fa131357293 100644
--- a/Localization/pl/OrchardCore.AdminMenu.po
+++ b/Localization/pl/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Utwórz menu administratora {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nazwa"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Utwórz węzeł"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Edytuj Menu Administratora: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nazwa"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Edytuj węzeł"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Priorytet odnośnika - odnośnik ma być wyświetlany jako aktywny zamiast innego, gdy oba wskazują na ten sam Url. Odnośnik z najwyższą wartością ma aktywny status w nawigacji."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Kolejność pozycji tego odnosnika w menu administracyjnym."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Odnośnik"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Tekst odnośnika pokazany w strukturze."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Adres Url odnośnika. Odnośnik będzie wyświetlany tylko wtedy, gdy on sam lub jeden z jego dzieci posiada adres Url. Adres Url będzie względny do katalogu głównego witryny administracyjnej"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Wybierz ikonę"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Tekst zastępczy"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Tekst pozycji menu, który będzie wyświetlany w strukturze."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "Wybierz"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Wybierz ikonę do wyświetlenia, gdy ta pozycja menu jest na pierwszym poziomie."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Wybierz ikonę"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Uprawnienia"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Wpisz szukaną frazę"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Zaznacz"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Usuń"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Brak wyników"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Uprawnienia wymagane do wyświetlenia tej pozycji menu (opcjonalne)."
diff --git a/Localization/pl/OrchardCore.Alias.po b/Localization/pl/OrchardCore.Alias.po
index f767fd6739f50..a159330adcdd3 100644
--- a/Localization/pl/OrchardCore.Alias.po
+++ b/Localization/pl/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Wzór nie zawiera prawidłowego wyrażenia \"Liquid\". Szczegóły: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Pozostaw puste, aby go ponownie wygenerować."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias został wygenerowany, a wprowadzanie danych jest wyłączone"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pl/OrchardCore.ArchiveLater.po b/Localization/pl/OrchardCore.ArchiveLater.po
index 8d0d32377279e..3861d4928d317 100644
--- a/Localization/pl/OrchardCore.ArchiveLater.po
+++ b/Localization/pl/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/pl/OrchardCore.AuditTrail.po b/Localization/pl/OrchardCore.AuditTrail.po
index 9cd0fde7d6906..9cd2ade603b86 100644
--- a/Localization/pl/OrchardCore.AuditTrail.po
+++ b/Localization/pl/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/pl/OrchardCore.Autoroute.po b/Localization/pl/OrchardCore.Autoroute.po
index 21e423f6bf26d..522c5f64b941c 100644
--- a/Localization/pl/OrchardCore.Autoroute.po
+++ b/Localization/pl/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pl/OrchardCore.BackgroundTasks.po b/Localization/pl/OrchardCore.BackgroundTasks.po
index c26ff41d03003..ba3d3ae86969a 100644
--- a/Localization/pl/OrchardCore.BackgroundTasks.po
+++ b/Localization/pl/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/pl/OrchardCore.ContentFields.po b/Localization/pl/OrchardCore.ContentFields.po
index 2e7e990e8f184..ed60dd73e9892 100644
--- a/Localization/pl/OrchardCore.ContentFields.po
+++ b/Localization/pl/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Przełącznik"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standardowe"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Brak elementów."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standardowy"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nie opublikowano"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Wpisz aby wyszukać"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Wybierz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Usuń"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nie znaleziono żadnych wyników"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Określa czy pozwolić na wybór wielu elementów."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Pokaż wszystkie typy treści"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "Wszystkie typy zawartości tych stereotypów"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Typy treści do wyświetlenia. Wybierz co najmniej jeden."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Zlokalizowane"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Określa czy wartość jest wymagana."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Określa czy wartość jest wymagana."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Edytor WYSIWYG"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standardowe"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Wprowadź opcje edytora, po zapisaniu język jest zawsze ustawiony na `html`."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentacja dla opcji"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Określa czy adres url jest używany po wybraniu z Wgraj Media (domyślnie wstawiony jest Shortcode)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentacja dla opcji"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowy"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Tekst odnośnika"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Czy adres URL jest wymagany."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Użyj adresu URL odnośnika"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego odnośnika w edytorze."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tekstu tego odnośnika w edytorze."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Podpowiedź (tekst zastępczy) do wyświetlenia, gdy wprowadzanie adresu URL jest puste."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Podpowiedź (tekst zastępczy) do wyświetlenia, gdy pole wprowadzania tekstu jest puste."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Prawidłowy adres URL proponowany podczas tworzenia elementu treści."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Brak elementów."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nie opublikowano"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Wpisz aby wyszukać"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Wybierz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Usuń"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nie znaleziono żadnych wyników"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Określa czy pozwolić na wybór wielu elementów."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Typy zawartości do wyświetlenia. Wybierz co najmniej jeden."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Edytuj dane"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Reprezentacja JSON dozwolonych wartości, np. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Zakres"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Brak"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Ikony ładowania"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Określa czy wartość jest wymagana."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Podpowiedź do wyświetlenia gdy dane wejściowe są puste. (opcjonalnie)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Liczba cyfr po przecinku."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Dopuszczalna wartość minimalna. (opcjonalnie)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Dopuszczalna wartość maksymalna. (opcjonalnie)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standardowe"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standardowe"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Edytuj dane"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Reprezentacja JSON dozwolonych wartości, np. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Określa czy wartość jest wymagana."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Określa czy wartość jest wymagana."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Wymagane"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Określa czy wartość jest wymagana."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Podpowiedź"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Szerokość"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Szerokość elementu wideo"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Wysokość"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Wysokość elementu wideo"
diff --git a/Localization/pl/OrchardCore.ContentLocalization.po b/Localization/pl/OrchardCore.ContentLocalization.po
index b11edaf7d01aa..1e7aee3c5b4b6 100644
--- a/Localization/pl/OrchardCore.ContentLocalization.po
+++ b/Localization/pl/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/pl/OrchardCore.ContentPreview.po b/Localization/pl/OrchardCore.ContentPreview.po
index 20a002c622035..e33accbcd994f 100644
--- a/Localization/pl/OrchardCore.ContentPreview.po
+++ b/Localization/pl/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Wzór nie zawiera prawidłowego wyrażenia \"Liquid\". Szczegóły: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Podgląd"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Podgląd został rozłączony"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Błąd podglądu"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pl/OrchardCore.ContentTypes.po b/Localization/pl/OrchardCore.ContentTypes.po
index 5a91652445157..26606ee7ee38f 100644
--- a/Localization/pl/OrchardCore.ContentTypes.po
+++ b/Localization/pl/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Części treści"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Wyświetlana nazwa nie może być pusta."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Typ o tej samej nazwie już istnieje."
@@ -66,10 +66,10 @@ msgstr "Typ o tej samej nazwie już istnieje."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Nazwa techniczna nie może być pusta."
@@ -78,10 +78,10 @@ msgstr "Nazwa techniczna nie może być pusta."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Nazwa techniczna musi zaczynać się literą."
@@ -90,10 +90,10 @@ msgstr "Nazwa techniczna musi zaczynać się literą."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Nazwa techniczna zawiera nieprawidłowe znaki."
@@ -101,133 +101,133 @@ msgstr "Nazwa techniczna zawiera nieprawidłowe znaki."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Typ o tej samej nazwie technicznej już istnieje."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Typ zawartości \"{0}\" został utworzony."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Ustawienia \"{0}\" zostały zapisane."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" został usunięty."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Część \"{0}\" została dodana."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Część o tej samej nazwie wyświetlacza już istnieje."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Część o tej samej nazwie technicznej już istnieje."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Część \"{0}\" została usunięta."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Nie można utworzyć części treści."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Część treści \"{0}\" została utworzona."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Ustawienia \"{0}\" zostały zapisane."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Pole o tej samej nazwie już istnieje."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Pole o tej samej nazwie technicznej już istnieje."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Pole \"{0}\" zostało dodane."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Zmieniono wyświetlaną nazwę na {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Ustawienia pola \"{0}\" zostały zapisane."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Pole \"{0}\" zostało usunięte."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Ustawienia części \"{0}\" zostały zapisane."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Nazwa typu treści nie może być pusta."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Nie można dodać części o nazwie '{0}'. Już istnieje."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Dodaj nowe pole do \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nazwa pola, która będzie wyświetlana na ekranach."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Dodaj nazwaną Część do \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Nazwa części wielokrotnego użytku, która będzie wyświetlana na ekranach."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Techniczna nazwa części wielokrotnego użytku."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Nazwa części jaka będzie wyświetlana na ekranach. Pozostaw puste, aby użyć domyślnych."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Zaznacz, aby pozwolić na wielokrotne dołączanie tej części."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nazwa typu, która będzie wyświetlana na ekranach."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Nowy Typ Treści"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nazwa typu, która będzie wyświetlana na ekranach."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Nowa Część Treści"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Utwórz"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Edytuj Typ Treści - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Pola"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Edytuj"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Usuń"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Tryb wyświetlania"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Dodaj Pole"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Części"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Zawiera pola dla bieżącego typu"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Dodaj Części"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Dodaj nazwaną Część"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Zapisz"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Usuń"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" ustawienia dla \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nazwa pola, która będzie wyświetlana na ekranach."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Nazwa techniczna pola."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Jaki rodzaj edytora powinien być użyty?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Jaki rodzaj trybu wyświetlania powinien być użyty?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Zapisz"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Anuluj"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Niektóre ustawienia części wspólne dla wszystkich typów można również zdefiniować na poziomie <a href=\"{0}\">definicji części</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Nazwa części, która będzie wyświetlana na ekranach."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Opis części, która będzie wyświetlana na ekranach."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Jaki rodzaj edytora powinien być użyty?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Zapisz"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Anuluj"
diff --git a/Localization/pl/OrchardCore.Contents.po b/Localization/pl/OrchardCore.Contents.po
index 7e1143a447102..ac1a47a5d0c20 100644
--- a/Localization/pl/OrchardCore.Contents.po
+++ b/Localization/pl/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Cofnięto publikację elementu - {0}."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Wszystkie Typy Treści"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Treść"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Gotowe"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Data utworzenia lub pierwszej publikacji elementu treści."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "kontynuuj"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Dowolny typ treści"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Dowolny typ treści"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Treść"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Dowolny typ treści"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Pokaż wszystkie typy treści"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Wybierz ikonę"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Pokaż wszystkie typy treści"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Dowolny typ treści"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Dowolny typ treści"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Dowolny typ treści"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Utwórz treść"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Zaznacz, jeśli chcesz, aby element zawartości był opublikowany po utworzeniu. Pozostaw odznaczone, aby utworzyć wersję roboczą."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Usuń treść za pomocą wyrażenia: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Treść"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Nowy"
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publikuj treść za pomocą wyrażenia: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Cofnij publikację zawartości używając wyrażenia: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/pl/OrchardCore.CustomSettings.po b/Localization/pl/OrchardCore.CustomSettings.po
index 8af51606ed4f6..c9bf9d88aaa97 100644
--- a/Localization/pl/OrchardCore.CustomSettings.po
+++ b/Localization/pl/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Własne ustawienia"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Wszystkie"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/pl/OrchardCore.Data.YesSql.po b/Localization/pl/OrchardCore.Data.YesSql.po
index dc597d91aedd9..5b953ad235368 100644
--- a/Localization/pl/OrchardCore.Data.YesSql.po
+++ b/Localization/pl/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/pl/OrchardCore.Demo.po b/Localization/pl/OrchardCore.Demo.po
index 5d73231679985..fe3af8218589e 100644
--- a/Localization/pl/OrchardCore.Demo.po
+++ b/Localization/pl/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Imię"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/pl/OrchardCore.Deployment.Remote.po b/Localization/pl/OrchardCore.Deployment.Remote.po
index a1dd54e0d1e77..dde8dc8656d06 100644
--- a/Localization/pl/OrchardCore.Deployment.Remote.po
+++ b/Localization/pl/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/pl/OrchardCore.Deployment.po b/Localization/pl/OrchardCore.Deployment.po
index e39d6ecfc43af..69c0a9a26da6b 100644
--- a/Localization/pl/OrchardCore.Deployment.po
+++ b/Localization/pl/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Nazwa jest obowiązkowa."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Utwórz plan wdrożenia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Niestandardowy plik do dodania jako część planu."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Nazwa pliku zostanie dodana do archiwum."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Plany wdrożenia"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Wszystkie"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Edytuj plan wdrożenia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/pl/OrchardCore.Diagnostics.po b/Localization/pl/OrchardCore.Diagnostics.po
index 9d3c0edeeff27..bee231b90f907 100644
--- a/Localization/pl/OrchardCore.Diagnostics.po
+++ b/Localization/pl/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2021-07-15 18:34\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/pl/OrchardCore.Email.Abstractions.po b/Localization/pl/OrchardCore.Email.Abstractions.po
index 52db9026b2ff2..c247f9c0064f9 100644
--- a/Localization/pl/OrchardCore.Email.Abstractions.po
+++ b/Localization/pl/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Pole {0} jest wymagane."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Metoda '{0} nie jest obsługiwana."
diff --git a/Localization/pl/OrchardCore.Email.po b/Localization/pl/OrchardCore.Email.po
index 2741f21e297c7..13c6817bf87ab 100644
--- a/Localization/pl/OrchardCore.Email.po
+++ b/Localization/pl/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/pl/OrchardCore.Facebook.po b/Localization/pl/OrchardCore.Facebook.po
index 0c539bd683aae..08696ef68fff7 100644
--- a/Localization/pl/OrchardCore.Facebook.po
+++ b/Localization/pl/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/pl/OrchardCore.Features.po b/Localization/pl/OrchardCore.Features.po
index e21b5958cee2a..a2e7623702836 100644
--- a/Localization/pl/OrchardCore.Features.po
+++ b/Localization/pl/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funkcje"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Wybierz jedną lub więcej funkcji."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Operacje na zaznaczonych"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Wyłącz"
@@ -136,8 +136,8 @@ msgstr "Wyłącz"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Włącz"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Nieskategoryzowane"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Wyłącz funkcję"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Tak"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Nie"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Nic tutaj nie ma!</strong> Twoje wyszukiwanie nie zwróciło wyników."
diff --git a/Localization/pl/OrchardCore.Flows.po b/Localization/pl/OrchardCore.Flows.po
index 8b5c7211ff7cc..bbf192f2a1ea6 100644
--- a/Localization/pl/OrchardCore.Flows.po
+++ b/Localization/pl/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Dodaj element"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Typy zawartości, które może zawierać ta torba, np. slajd dla slajdów."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Wstaw widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Usuń"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Czy na pewno chcesz usunąć ten element?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/pl/OrchardCore.Forms.po b/Localization/pl/OrchardCore.Forms.po
index c048c0aa944c4..47bdd39e864a0 100644
--- a/Localization/pl/OrchardCore.Forms.po
+++ b/Localization/pl/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/pl/OrchardCore.GitHub.po b/Localization/pl/OrchardCore.GitHub.po
index 315ecb49ade40..7792b552bfed2 100644
--- a/Localization/pl/OrchardCore.GitHub.po
+++ b/Localization/pl/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/pl/OrchardCore.Google.po b/Localization/pl/OrchardCore.Google.po
index c52bd4e7388fa..8381624bf171c 100644
--- a/Localization/pl/OrchardCore.Google.po
+++ b/Localization/pl/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/pl/OrchardCore.Html.po b/Localization/pl/OrchardCore.Html.po
index aea6d8b26abcf..7327a2d1af657 100644
--- a/Localization/pl/OrchardCore.Html.po
+++ b/Localization/pl/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/pl/OrchardCore.Https.po b/Localization/pl/OrchardCore.Https.po
index 25d48efe61e33..54888fbaf0bae 100644
--- a/Localization/pl/OrchardCore.Https.po
+++ b/Localization/pl/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/pl/OrchardCore.Infrastructure.Abstractions.po b/Localization/pl/OrchardCore.Infrastructure.Abstractions.po
index 589bf93e1b02d..f3b75b7e1cecc 100644
--- a/Localization/pl/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/pl/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/pl/OrchardCore.Layers.po b/Localization/pl/OrchardCore.Layers.po
index 3b8e0587765e8..02669b479112b 100644
--- a/Localization/pl/OrchardCore.Layers.po
+++ b/Localization/pl/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/pl/OrchardCore.Liquid.po b/Localization/pl/OrchardCore.Liquid.po
index 9f6085b930d21..e57f959cc9740 100644
--- a/Localization/pl/OrchardCore.Liquid.po
+++ b/Localization/pl/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/pl/OrchardCore.Lists.po b/Localization/pl/OrchardCore.Lists.po
index 329a43df07aee..1ec7b9112e2d7 100644
--- a/Localization/pl/OrchardCore.Lists.po
+++ b/Localization/pl/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/pl/OrchardCore.Localization.po b/Localization/pl/OrchardCore.Localization.po
index 163dd36502a50..a6840feef1373 100644
--- a/Localization/pl/OrchardCore.Localization.po
+++ b/Localization/pl/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Kultury"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Kultura jest wymagana"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Aktywne kultury skonfigurowane dla witryny."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Dodaj kulturę"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/pl/OrchardCore.Markdown.po b/Localization/pl/OrchardCore.Markdown.po
index 7eb3668153e4d..7a332e5582550 100644
--- a/Localization/pl/OrchardCore.Markdown.po
+++ b/Localization/pl/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pl/OrchardCore.Media.po b/Localization/pl/OrchardCore.Media.po
index 46e21007b0b3a..be22e39f48974 100644
--- a/Localization/pl/OrchardCore.Media.po
+++ b/Localization/pl/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Nie można przenieść multimediów, ponieważ plik o tej samej nazwie już istnieje"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Profil o takiej nazwie już istnieje."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Profil został pomyślnie usunięty."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Kadruj"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Wystąpił błąd podczas obsługi plików."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Określa czy pobierać zasoby z tylko najwyższego katalogu czy ze wszystkich podkatalogów."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Odwróć"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Utwórz Katalog"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Zmień nazwę"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Multimedia"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Wszystkie"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr "Eksport wszystkich lub określonych multimediów."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Załączone"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Wybierz media"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pl/OrchardCore.Menu.po b/Localization/pl/OrchardCore.Menu.po
index 2421eb87b3211..b47a24525b0ad 100644
--- a/Localization/pl/OrchardCore.Menu.po
+++ b/Localization/pl/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Edytuj {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nazwa"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/pl/OrchardCore.Microsoft.Authentication.po b/Localization/pl/OrchardCore.Microsoft.Authentication.po
index a95d735f7f69f..728f3ec7da8d8 100644
--- a/Localization/pl/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/pl/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/pl/OrchardCore.Navigation.po b/Localization/pl/OrchardCore.Navigation.po
index 4f53ea2eac7a1..52e1a6458f6b5 100644
--- a/Localization/pl/OrchardCore.Navigation.po
+++ b/Localization/pl/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/pl/OrchardCore.Notifications.po b/Localization/pl/OrchardCore.Notifications.po
index 271769f679970..1e42d13685703 100644
--- a/Localization/pl/OrchardCore.Notifications.po
+++ b/Localization/pl/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/pl/OrchardCore.OpenId.po b/Localization/pl/OrchardCore.OpenId.po
index ed28780f39afb..e565f6f6c54e1 100644
--- a/Localization/pl/OrchardCore.OpenId.po
+++ b/Localization/pl/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/pl/OrchardCore.Placements.po b/Localization/pl/OrchardCore.Placements.po
index b9b80390c6a96..25f3ada863ad4 100644
--- a/Localization/pl/OrchardCore.Placements.po
+++ b/Localization/pl/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/pl/OrchardCore.ProjectTemplates.po b/Localization/pl/OrchardCore.ProjectTemplates.po
index 075fdd80ca70e..31668f1c2399a 100644
--- a/Localization/pl/OrchardCore.ProjectTemplates.po
+++ b/Localization/pl/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Pokaż"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/pl/OrchardCore.PublishLater.po b/Localization/pl/OrchardCore.PublishLater.po
index 867f4dd060adb..e69be166d2f5c 100644
--- a/Localization/pl/OrchardCore.PublishLater.po
+++ b/Localization/pl/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Opublikuj później"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/pl/OrchardCore.Queries.po b/Localization/pl/OrchardCore.Queries.po
index c7a0ba9071b7a..9a9afdaeeee60 100644
--- a/Localization/pl/OrchardCore.Queries.po
+++ b/Localization/pl/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Uruchom zapytanie SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/pl/OrchardCore.ReCaptcha.Core.po b/Localization/pl/OrchardCore.ReCaptcha.Core.po
index 8d41365ac07f5..2f5602d26dc86 100644
--- a/Localization/pl/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/pl/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Nie udało się zweryfikować captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Nie udało się zweryfikować captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Język {0} nie został znaleziony"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/pl/OrchardCore.ReCaptcha.po b/Localization/pl/OrchardCore.ReCaptcha.po
index 7a307bd26480d..02cc4fa755e74 100644
--- a/Localization/pl/OrchardCore.ReCaptcha.po
+++ b/Localization/pl/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Eksport ustawień ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Zadanie Walidacji ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Walidacja"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Gotowe"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Poprawmy"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Niepoprawny"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Nieudana walidacja Captcha. Spróbuj ponownie."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Obecny tenant zostanie przeładowany po zapisaniu ustawień."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Twój Klucz Witryny (Site Key) dla Google reCaptcha."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/pl/OrchardCore.Recipes.Core.po b/Localization/pl/OrchardCore.Recipes.Core.po
index 3dbdf3807d84f..686f00195473f 100644
--- a/Localization/pl/OrchardCore.Recipes.Core.po
+++ b/Localization/pl/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/pl/OrchardCore.Roles.po b/Localization/pl/OrchardCore.Roles.po
index b0a29eab1d15b..9b089d611dc9c 100644
--- a/Localization/pl/OrchardCore.Roles.po
+++ b/Localization/pl/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/pl/OrchardCore.Rules.po b/Localization/pl/OrchardCore.Rules.po
index 7df031ee5319a..0b97903aa9c55 100644
--- a/Localization/pl/OrchardCore.Rules.po
+++ b/Localization/pl/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/pl/OrchardCore.Search.Elasticsearch.po b/Localization/pl/OrchardCore.Search.Elasticsearch.po
index 60125836f6f4b..e5942e57e44c6 100644
--- a/Localization/pl/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/pl/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/pl/OrchardCore.Search.Lucene.po b/Localization/pl/OrchardCore.Search.Lucene.po
index d07f8cdde1b92..480d0cb7a1184 100644
--- a/Localization/pl/OrchardCore.Search.Lucene.po
+++ b/Localization/pl/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/pl/OrchardCore.Search.po b/Localization/pl/OrchardCore.Search.po
index 82a17b41cc233..46aa55ed266a2 100644
--- a/Localization/pl/OrchardCore.Search.po
+++ b/Localization/pl/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/pl/OrchardCore.Security.po b/Localization/pl/OrchardCore.Security.po
index 525839bab8285..0503cf431f5be 100644
--- a/Localization/pl/OrchardCore.Security.po
+++ b/Localization/pl/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/pl/OrchardCore.Seo.po b/Localization/pl/OrchardCore.Seo.po
index 83ca977dc2b04..7be7d9dbff91f 100644
--- a/Localization/pl/OrchardCore.Seo.po
+++ b/Localization/pl/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/pl/OrchardCore.Settings.po b/Localization/pl/OrchardCore.Settings.po
index 66a5f3021cb99..d66dd4f467557 100644
--- a/Localization/pl/OrchardCore.Settings.po
+++ b/Localization/pl/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/pl/OrchardCore.Setup.Core.po b/Localization/pl/OrchardCore.Setup.Core.po
index 578ceeba512a1..707dda396d456 100644
--- a/Localization/pl/OrchardCore.Setup.Core.po
+++ b/Localization/pl/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/pl/OrchardCore.Setup.po b/Localization/pl/OrchardCore.Setup.po
index 1a5815aeafbe8..ae5c030c3d5db 100644
--- a/Localization/pl/OrchardCore.Setup.po
+++ b/Localization/pl/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Hasło musi mieć co najmniej {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Nie można utworzyć witryny bez przepisu."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "To jest używane jako domyślny tytuł Twoich stron."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Przepisy pozwalają na skonfigurowanie witryny z dodatkowymi wstępnie skonfigurowanymi opcjami, funkcjami i ustawieniami."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Określa domyślną strefę czasową używaną podczas wyświetlania i edycji dat i czasu."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Pokaż/ukryj ciąg połączeń"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Super użytkownik ma wszystkie prawa. Powinien być używany tylko podczas instalacji i przywracania podczas odzyskania po awarii."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Adres e-mail jest nieprawidłowy."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Siła hasła"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/pl/OrchardCore.Shortcodes.po b/Localization/pl/OrchardCore.Shortcodes.po
index 12a4f8327129b..72e7055f03eeb 100644
--- a/Localization/pl/OrchardCore.Shortcodes.po
+++ b/Localization/pl/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/pl/OrchardCore.Sitemaps.po b/Localization/pl/OrchardCore.Sitemaps.po
index e188dd425f404..2cc681b0840c4 100644
--- a/Localization/pl/OrchardCore.Sitemaps.po
+++ b/Localization/pl/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/pl/OrchardCore.Sms.po b/Localization/pl/OrchardCore.Sms.po
index fc191c4f07ae7..31ed5034c70f5 100644
--- a/Localization/pl/OrchardCore.Sms.po
+++ b/Localization/pl/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/pl/OrchardCore.Spatial.po b/Localization/pl/OrchardCore.Spatial.po
index 2352083782a31..fdc9bd48082f2 100644
--- a/Localization/pl/OrchardCore.Spatial.po
+++ b/Localization/pl/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pl/OrchardCore.Taxonomies.po b/Localization/pl/OrchardCore.Taxonomies.po
index a1bbba1ec9834..000724c943f97 100644
--- a/Localization/pl/OrchardCore.Taxonomies.po
+++ b/Localization/pl/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Nie można odnaleźć taksonomii. Proszę sprawdzić ustawienia dla tego pola."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tekst podpowiedzi do wyświetlenia dla tego pola w edytorze."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taksonomia"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Wymagane"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Czy wybrano co najmniej jeden element."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unikalny"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Tylko liście"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Czy liście są jedynymi przedmiotami, które mogą być wybrane."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Określ typ treści"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Dodaj {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Ponownie uporządkowałeś taksonomię."
diff --git a/Localization/pl/OrchardCore.Templates.Cms.Module.po b/Localization/pl/OrchardCore.Templates.Cms.Module.po
index fcf98d0914f13..62e43cd081e8e 100644
--- a/Localization/pl/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/pl/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Pokaż"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/pl/OrchardCore.Templates.po b/Localization/pl/OrchardCore.Templates.po
index 1113123b17222..8c5527d6c46f9 100644
--- a/Localization/pl/OrchardCore.Templates.po
+++ b/Localization/pl/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Podgląd"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Nazwa szablonu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Opis szablonu."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Podgląd"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Nazwa szablonu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Opis szablonu."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/pl/OrchardCore.Tenants.po b/Localization/pl/OrchardCore.Tenants.po
index 85b237f5a0810..a268829f63a7e 100644
--- a/Localization/pl/OrchardCore.Tenants.po
+++ b/Localization/pl/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/pl/OrchardCore.Tests.po b/Localization/pl/OrchardCore.Tests.po
index e97f8276f3da9..58abd557da955 100644
--- a/Localization/pl/OrchardCore.Tests.po
+++ b/Localization/pl/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/pl/OrchardCore.Themes.po b/Localization/pl/OrchardCore.Themes.po
index 7f8fdf0e9f471..288896f8ebf45 100644
--- a/Localization/pl/OrchardCore.Themes.po
+++ b/Localization/pl/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Eksportuje aktualnie wybrany motyw witryny i motyw administratora."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/pl/OrchardCore.Title.po b/Localization/pl/OrchardCore.Title.po
index 52473b776b991..b026a543ceac5 100644
--- a/Localization/pl/OrchardCore.Title.po
+++ b/Localization/pl/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pl/OrchardCore.Twitter.po b/Localization/pl/OrchardCore.Twitter.po
index 005f88d997e29..5c022cd106e72 100644
--- a/Localization/pl/OrchardCore.Twitter.po
+++ b/Localization/pl/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/pl/OrchardCore.Users.Core.po b/Localization/pl/OrchardCore.Users.Core.po
index 4e22d52402e27..5315223b99f2a 100644
--- a/Localization/pl/OrchardCore.Users.Core.po
+++ b/Localization/pl/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-mail '{0}' jest nieprawidłowy."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Nieoczekiwany błąd: '{0}'."
diff --git a/Localization/pl/OrchardCore.Users.po b/Localization/pl/OrchardCore.Users.po
index 0ff776252750e..e3fe8447ef7c4 100644
--- a/Localization/pl/OrchardCore.Users.po
+++ b/Localization/pl/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Użytkownik został utworzony pomyślnie"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Nieprawidłowa próba logowania."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Twoje hasło zostało pomyślnie zmienione."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Witryna nie zezwala na rejestrację użytkownika."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Aktywni użytkownicy"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Nieaktywni użytkownicy"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nazwa"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Zatwierdź"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Włącz"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Wyłącz"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Usuń"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Wszystkie role"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Użytkownik {0} został pomyślnie zatwierdzony."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Użytkownik {0} został usunięty."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Użytkownik {0} został pomyślnie wyłączony."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Nie można usunąć użytkownika."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Hasło zostało zaktualizowane poprawnie."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Ustawienia logowania"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Przypisz zadania i role użytkownika"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Użytkownik"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Gotowe"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Nie powiodło się"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Zarejestruj zadanie dla użytkownika"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Gotowe"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Prawidłowy"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Nieprawidłowy"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Usługa e-mail nie jest dostępna"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} do roli {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Użytkownik do przypisania. Przy użyciu wyrażenia \"Liquid\"."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Aktualne hasło"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Utwórz użytkownika"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Edytuj hasło"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Zaloguj się"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Utwórz nowe konto."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Hasło"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Wyślij e-mail z potwierdzeniem"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Resetuj hasło"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,16 +3518,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/pl/OrchardCore.Widgets.po b/Localization/pl/OrchardCore.Widgets.po
index 5aa28e76af86b..cae2ee4d5aa45 100644
--- a/Localization/pl/OrchardCore.Widgets.po
+++ b/Localization/pl/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Dodaj Widżet"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Standardowy"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/pl/OrchardCore.Workflows.po b/Localization/pl/OrchardCore.Workflows.po
index a462d12116542..e0e1a93ef48e6 100644
--- a/Localization/pl/OrchardCore.Workflows.po
+++ b/Localization/pl/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Sesja"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Wykonano"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Prawidłowy"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Nieprawidłowy"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Zadanie Korelowania"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Podstawowa"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Wykonano"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Zadanie Pętla For-Each"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Przepływ kontrolowany"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Iteruj"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Wykonano"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Zadanie Rozwidlenia"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Kontrola przepływu"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Zadanie Pętla For"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Kontrola przepływu"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Iteruj"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Wykonano"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Zadanie If-Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Kontrola przepływu"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Prawda"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Fałsz"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Zadanie Zcalania"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Kontrola przepływu"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Złączono"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Zadanie Logowania"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Podstawowa"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Wykonano"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Wyjątki"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Zadanie Powiadomienia"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "UI"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Wykonano"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Zadanie Skryptu"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Kontrola przepływu"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Zadanie Ustaw Wyjście"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Podstawowa"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Gotowe"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Zadanie Ustaw Właściwość"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Podstawowa"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Wykonano"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Zadanie Pętla While"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Kontrola przepływu"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Iteruj"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Gotowe"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Aktywność zaktualizowana pomyślnie."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Ostatnio utworzone"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Najdawniej utworzone"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Koreluj"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Obsługa przychodzących żądań HTTP"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/pl/TheAdmin.po b/Localization/pl/TheAdmin.po
index 47d82b88e3396..be788dc362ed7 100644
--- a/Localization/pl/TheAdmin.po
+++ b/Localization/pl/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Tryb jasny"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Tryb ciemny"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Odwiedź stronę"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Zwiń / rozwiń menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Usuń"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Czy na pewno chcesz usunąć ten element?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Anuluj"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/pl/TheAgencyTheme.po b/Localization/pl/TheAgencyTheme.po
index a3abd7037bc19..75c37f5b48784 100644
--- a/Localization/pl/TheAgencyTheme.po
+++ b/Localization/pl/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/pl/TheBlogTheme.po b/Localization/pl/TheBlogTheme.po
index e594acae6c0dc..fa1c47621fd33 100644
--- a/Localization/pl/TheBlogTheme.po
+++ b/Localization/pl/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/pl/TheTheme.po b/Localization/pl/TheTheme.po
index c21d7cad1ac86..ad2e54c97c68b 100644
--- a/Localization/pl/TheTheme.po
+++ b/Localization/pl/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Witamy w Orchard Core, Twoja strona została pomyślnie skonfigurowana."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/pt-BR/OrchardCore.Admin.po b/Localization/pt-BR/OrchardCore.Admin.po
index c3958c46d390c..80d06b8ea84fd 100644
--- a/Localization/pt-BR/OrchardCore.Admin.po
+++ b/Localization/pt-BR/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Administração"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Configurações da Administração"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exporta as configurações da administração."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Sinta-se à vontade para navegar no menu e descobrir todas as suas possibilidades."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Ativar o tema modo escuro do admin"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Se um tema de administrador de modo escuro pode ser exibido."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Se os títulos das páginas são exibidos na barra superior."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Administração"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/pt-BR/OrchardCore.AdminDashboard.po b/Localization/pt-BR/OrchardCore.AdminDashboard.po
index c3a4ec1c4bdf3..da24b1a0f7efe 100644
--- a/Localization/pt-BR/OrchardCore.AdminDashboard.po
+++ b/Localization/pt-BR/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Não"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Posição"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Largura"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/pt-BR/OrchardCore.AdminMenu.po b/Localization/pt-BR/OrchardCore.AdminMenu.po
index 6c3f1c9229feb..af23d733eff81 100644
--- a/Localization/pt-BR/OrchardCore.AdminMenu.po
+++ b/Localization/pt-BR/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Criar Menu de administração {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Criar Item"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Editar Menu de Administração: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Editar Item"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "A prioridade deste link para ser exibido como ativo, em vez de outro, quando ambos tiverem a mesma Url. O link com o maior valor terá o status ativo na navegação."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "A ordenação deste link no menu de administração."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "O texto do link será mostrado como árvore."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "O url do link. Um link será exibido apenas se ele ou um dos seus filhos tiver um url. O url será relativo à raiz do site de administração"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Escolha um ícone"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Dica de Preenchimento"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "O texto do item de menu será exibido como árvore."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Escolher"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Selecione um ícone para exibir quando este item de menu está no primeiro nível."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Escolha um ícone"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Permissões"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Digite para pesquisar"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Selecionar"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Excluir"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Nenhum resultado encontrado"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "As permissões necessárias para exibir este item de menu (opcional)."
diff --git a/Localization/pt-BR/OrchardCore.Alias.po b/Localization/pt-BR/OrchardCore.Alias.po
index 9fa95d2b290a4..ca869c72f16ad 100644
--- a/Localization/pt-BR/OrchardCore.Alias.po
+++ b/Localization/pt-BR/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O modelo não contém uma expressão Liquid válida. Detalhes: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Deixe em branco para gerar novamente."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "O Alias é gerado e a digitação está desativada"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt-BR/OrchardCore.ArchiveLater.po b/Localization/pt-BR/OrchardCore.ArchiveLater.po
index c401fe1363f75..58a27911c8045 100644
--- a/Localization/pt-BR/OrchardCore.ArchiveLater.po
+++ b/Localization/pt-BR/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "Arquivar Depois"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "Cancelar Publicar Mais Tarde"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/pt-BR/OrchardCore.AuditTrail.po b/Localization/pt-BR/OrchardCore.AuditTrail.po
index bdcce5309d59c..cc1116cbf4252 100644
--- a/Localization/pt-BR/OrchardCore.AuditTrail.po
+++ b/Localization/pt-BR/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Trilha de auditoria"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Todas categorias"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Intervalo de tempo personalizado"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/pt-BR/OrchardCore.Autoroute.po b/Localization/pt-BR/OrchardCore.Autoroute.po
index 17a722e0d1e5f..511b78aab41d5 100644
--- a/Localization/pt-BR/OrchardCore.Autoroute.po
+++ b/Localization/pt-BR/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Seu link permanente é muito comprido. O link permanente pode ter até {0} caracteres."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Marque para desativar autoroute para esse item de conteúdo."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Marque para especificar que um item de conteúdo filho será encaminhado para um endereço absoluto."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt-BR/OrchardCore.BackgroundTasks.po b/Localization/pt-BR/OrchardCore.BackgroundTasks.po
index 74dbde2786e50..4a4912f56f9e0 100644
--- a/Localization/pt-BR/OrchardCore.BackgroundTasks.po
+++ b/Localization/pt-BR/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/pt-BR/OrchardCore.ContentFields.po b/Localization/pt-BR/OrchardCore.ContentFields.po
index 71957de305ce3..050dbaac4ec6f 100644
--- a/Localization/pt-BR/OrchardCore.ContentFields.po
+++ b/Localization/pt-BR/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Interruptor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica para este campo que será exibido no editor."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Nenhum item de conteúdo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Padrão"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Não publicado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Digite para pesquisar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Selecionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Excluir"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenhum resultado encontrado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Se deseja permitir a seleção de múltiplos elementos."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Exibir todos os tipos de conteúdo"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Os tipos de conteúdo a serem exibidos. Escolha pelo menos um."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica que será exibido para este campo no editor."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Localizado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica para este campo que será exibido no editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor de texto Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentação para opções"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Texto do link"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Use a URL do link"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "O texto da dica para a URL que será exibido no editor."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "O texto da dica para o texto do link que será exibido no editor."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Uma dica (placeholder) que será exibida quando a URL digitada estiver em branco."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Uma dica (placeholder) que será exibida quando o texto digitado estiver em branco."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Uma URL válida proposta ao criar um item de conteúdo."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Nenhum item de conteúdo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Padrão"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Não publicado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Digite para pesquisar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Selecionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Excluir"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenhum resultado encontrado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Se deseja permitir a seleção de múltiplos elementos."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Os tipos de conteúdo a serem exibidos. Escolha pelo menos um."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Intervalo"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Nenhum"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Incrementador Numérico"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica para este campo que será exibido no editor."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Uma dica para exibir quando o campo está vazio. (opcional)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "O número de casas decimais."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "O valor mínimo permitido. (opcional)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "O valor máximo permitido. (opcional)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Editar dados"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Uma representação JSON dos valores permitidos, por exemplo: {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica para este campo que será exibido no editor."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Obrigatório"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Se o campo é obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Dica"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica para este campo que será exibido no editor."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Largura"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "A largura da caixa do vídeo"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Altura"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "A altura da caixa do vídeo"
diff --git a/Localization/pt-BR/OrchardCore.ContentLocalization.po b/Localization/pt-BR/OrchardCore.ContentLocalization.po
index 97e5cc4ba3202..4afba4eb40f8f 100644
--- a/Localization/pt-BR/OrchardCore.ContentLocalization.po
+++ b/Localization/pt-BR/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Não foi possível criar a versão localizada do item de conteúdo."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/pt-BR/OrchardCore.ContentPreview.po b/Localization/pt-BR/OrchardCore.ContentPreview.po
index aab6b205d90d6..8f4dae808ffa1 100644
--- a/Localization/pt-BR/OrchardCore.ContentPreview.po
+++ b/Localization/pt-BR/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O modelo não contém uma expressão Liquid válida. Detalhes: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Pré-visualização"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Pré-visualização desconectada"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Erro de Pré-visualização"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt-BR/OrchardCore.ContentTypes.po b/Localization/pt-BR/OrchardCore.ContentTypes.po
index 5aa8677b02f47..a6cdaa9cf5a14 100644
--- a/Localization/pt-BR/OrchardCore.ContentTypes.po
+++ b/Localization/pt-BR/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Componentes de Conteúdo"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "O nome de exibição não pode estar em branco."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Já existe um Tipo de Conteúdo com este nome de exibição."
@@ -66,10 +66,10 @@ msgstr "Já existe um Tipo de Conteúdo com este nome de exibição."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "O nome técnico não pode estar em branco."
@@ -78,10 +78,10 @@ msgstr "O nome técnico não pode estar em branco."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "O Nome Técnico deve começar com uma letra."
@@ -90,10 +90,10 @@ msgstr "O Nome Técnico deve começar com uma letra."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "O nome técnico contém caracteres inválidos."
@@ -101,133 +101,133 @@ msgstr "O nome técnico contém caracteres inválidos."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Um tipo com o mesmo Nome Técnico já existe."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "O tipo de conteúdo \"{0}\" foi criado."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\" configurações foram salvas."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" foi excluído."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "O componente \"{0}\" foi adicionado."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Já existe um componente com o mesmo nome de exibição."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Já existe um componente com o mesmo nome técnico."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "O componente \"{0}\" foi excluído."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Não foi possível criar o componente de conteúdo."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "O componente de conteúdo \"{0}\" foi criado."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "As configurações de \"{0}\" foram salvas."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Um campo com o mesmo nome de exibição já existe."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Um campo com o mesmo Nome Técnico já existe."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "O campo \"{0}\" foi adicionado."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Nome de exibição alterado para {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "As configurações do campo \"{0}\" foram salvas."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "O campo \"{0}\" foi excluído."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "As configurações do componente \"{0}\" foram salvas."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "O nome do Tipo de Conteúdo não pode estar vazio."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Não é possível adicionar o componente com o nome '{0}'. Já existe."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Adicionar novo campo para \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nome do campo que será exibido nas páginas."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Adicionar Componente Nomeado para \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Nome do componente reutilizável que será exibido nas páginas."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Nome técnico do componente reutilizável."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Exporta o tipo de conteúdo especificado e definições de componentes para atualização."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Nome do componente que será exibido nas páginas. Deixe em branco para usar o padrão."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Marque para permitir que este componente seja adicionado várias vezes."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nome do tipo de conteúdo que será exibido nas páginas."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Novo Tipo de Conteúdo"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nome do tipo de conteúdo que será exibido nas páginas."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Novo Componente"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Criar"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Uma lista de definições de tipo de conteúdo separados por vírgula para serem excluídos"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Exporta o tipo de conteúdo especificado e definições de componentes para exclusão."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Editar Tipo de Conteúdo - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Campos"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Editar"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Excluir"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Adicionar campo"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Componentes"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Contém os campos para o tipo atual"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Adicionar Componentes"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Adicionar Componente Nomeado"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Salvar"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Excluir"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" configurações para \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nome do campo que será exibido nas páginas."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Nome técnico do campo."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Que tipo de editor deve ser usado?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Que tipo de modo de exibição deve ser usado?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Salvar"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Algumas configurações de componentes comuns para todos os tipos também podem ser definidas no nível de <a href=\"{0}\">Definição de Componente</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Nome do componente que será exibido nas páginas."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "A descrição do componente que será exibida nas páginas."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Que tipo de editor deve ser usado?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Que tipo de modo de exibição deve ser usado?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Salvar"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Cancelar"
diff --git a/Localization/pt-BR/OrchardCore.Contents.po b/Localization/pt-BR/OrchardCore.Contents.po
index 3c436b0d629b8..ca0346c21d679 100644
--- a/Localization/pt-BR/OrchardCore.Contents.po
+++ b/Localization/pt-BR/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "A publicação do tipo {0} foi cancelada."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Todos tipos de conteúdo"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Ocorreu um ou mais erros de validação."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Exportar as configurações atuais do site."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Conteúdo"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Concluído"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "A data quando o item de conteúdo foi criado ou publicado pela primeira vez."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "e continuar"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Ações"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Conteúdo"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Rascunho de conteúdo foi salvo."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Item de Conteúdo"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Mostrar todos os Tipos de Conteúdo"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Escolha um ícone"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Mostrar todos os Tipos de Conteúdo"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Limita a quantidade de itens de conteúdo a fornecer desta fonte. Nota: Apenas um tipo de conteúdo é selecionável quando esta opção é selecionada."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "A frequência padrão que estes tipos de conteúdo provavelmente serão alterados."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Criar Conteúdo"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Marque se você quer que o item de conteúdo seja publicado quando estiver sendo criado. Deixe desmarcado para criar uma versão rascunho."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Excluir conteúdo usando a expressão: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Ver Rascunho no formato JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Baixar o rascunho no formato JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Ver versão Publicada no formato JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Baixar versão Publicada no formato JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Ver no formato JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Conteúdo"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Novo"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publicar conteúdo usando expressão: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Recupera o conteúdo usando expressão: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Cancelar publicação de conteúdo usando expressão: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Atualizar conteúdo usando expressão: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Insira uma expressão JavaScript que compute o ID do Item de Conteúdo (ContentItemId) a ser atualizado. Por exemplo: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/pt-BR/OrchardCore.CustomSettings.po b/Localization/pt-BR/OrchardCore.CustomSettings.po
index e24b433e22534..bbf0cd2287ab8 100644
--- a/Localization/pt-BR/OrchardCore.CustomSettings.po
+++ b/Localization/pt-BR/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Configurações personalizadas"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Todas"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/pt-BR/OrchardCore.Data.YesSql.po b/Localization/pt-BR/OrchardCore.Data.YesSql.po
index ec2705c3a1eca..0373e40d22f3f 100644
--- a/Localization/pt-BR/OrchardCore.Data.YesSql.po
+++ b/Localization/pt-BR/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/pt-BR/OrchardCore.Demo.po b/Localization/pt-BR/OrchardCore.Demo.po
index fffd056224571..d884c0abf0366 100644
--- a/Localization/pt-BR/OrchardCore.Demo.po
+++ b/Localization/pt-BR/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Primeiro nome"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/pt-BR/OrchardCore.Deployment.Remote.po b/Localization/pt-BR/OrchardCore.Deployment.Remote.po
index 97d850376cf70..c7cd098438123 100644
--- a/Localization/pt-BR/OrchardCore.Deployment.Remote.po
+++ b/Localization/pt-BR/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Envia o plano de implantação para uma instância remota."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Nome do Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Criar instância remota"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Nome do Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Editar Cliente Remoto"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Nome do Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Editar instância remota"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Nome do Cliente"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/pt-BR/OrchardCore.Deployment.po b/Localization/pt-BR/OrchardCore.Deployment.po
index d53f39b88bad3..a27fcb1de2330 100644
--- a/Localization/pt-BR/OrchardCore.Deployment.po
+++ b/Localization/pt-BR/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Importação JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Excluir"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Plano de implantação excluído com sucesso."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "O nome é obrigatório."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Um plano de implantação com o mesmo nome já existe."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Plano de implantação atualizado com sucesso."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Plano de implantação excluído com sucesso."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Criar plano de implantação"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "O arquivo personalizado para adicionar como parte do plano."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "O nome do arquivo como ele será adicionado ao pacote."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Planos de Implantação"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Editar plano de implantação"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Arquivo do modelo a ser adicionado como parte do plano."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Nome do modelo."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Nome de exibição do modelo."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Descrição do modelo."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Autor do modelo."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Web site do modelo."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Versão do modelo."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Categorias do modelo (valores separados por vírgulas)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/pt-BR/OrchardCore.Diagnostics.po b/Localization/pt-BR/OrchardCore.Diagnostics.po
index e7a0654d103c7..2455b18527517 100644
--- a/Localization/pt-BR/OrchardCore.Diagnostics.po
+++ b/Localization/pt-BR/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Seu navegador enviou uma solicitação que o servidor não consegue interpretar."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Ocorreu um erro ao executar esta solicitação."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Você não tem acesso a este recurso."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "A página não pode ser encontrada."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Você não está autorizado a visualizar este conteúdo."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/pt-BR/OrchardCore.Email.Abstractions.po b/Localization/pt-BR/OrchardCore.Email.Abstractions.po
index 536fd2d4c77f6..9f7dbb59e3fc0 100644
--- a/Localization/pt-BR/OrchardCore.Email.Abstractions.po
+++ b/Localization/pt-BR/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "O campo {0} é obrigatório."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "O método de entrega '{0}' não é suportado."
diff --git a/Localization/pt-BR/OrchardCore.Email.po b/Localization/pt-BR/OrchardCore.Email.po
index 653b77362da91..353ad15ce7d15 100644
--- a/Localization/pt-BR/OrchardCore.Email.po
+++ b/Localization/pt-BR/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Email inválido."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Tarefa de Email"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Mensageria"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Falhou"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Enviar Email"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "O endereço de e-mail do autor que define de quem é o email. Deixe em branco para usar o endereço de e-mail configurado. Com suporte ao Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Endereço de e-mail do remetente. Necessário se não for o mesmo o endereço do campo De. Com suporte ao Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "O endereço de e-mail \"responder para\". Necessário se você quiser que respostas de e-mail sejam enviadas para um endereço diferente do endereço \"De\". Com suporte ao Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "A lista separada por vírgulas de endereços de e-mail de destinatário. Com suporte ao Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Configurações"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Para"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "O remetente é opcional, é útil quando o autor da mensagem é diferente do remetente do email."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Cco"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Responder para"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Assunto"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Corpo da mensagem"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "O tenant atual será recarregado quando as configurações forem salvas."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "O endereço de e-mail padrão para usar como remetente, a menos que o remetente de e-mail esteja definido."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Opções de entrega de Rede"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "O domínio do servidor SMTP, por exemplo <i>smtp.provedor.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "A porta do servidor SMTP, geralmente 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Quando essa opção for selecionada, o usuário do pool de aplicativos ou do processo do host é utilizado para autenticar com o servidor de email."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "O usuário para autenticação."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Opções de entrega do diretório de coleta"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Por exemplo: <i>C:\\Caminho\\Para\\seu\\Site\\ColetaDeEmails</i> para colocar e-mails em um diretório <i>ColetaDeEmails</i> na unidade de C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/pt-BR/OrchardCore.Facebook.po b/Localization/pt-BR/OrchardCore.Facebook.po
index 0e2e333dafe49..c353badb250c8 100644
--- a/Localization/pt-BR/OrchardCore.Facebook.po
+++ b/Localization/pt-BR/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "O conteúdo do FaceBook não contém uma expressão Liquid válida. Detalhes: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O conteúdo não contém uma expressão Liquid válida. Detalhes: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Configurações de login"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "O endereço da requisição, no contexto do endereço base da aplicação, para onde o navegador será redirecionado. O sistema processará esta requisição quando chegar."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "O template do plugin, formatado com Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Versão do SDK Javascript"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Iniciar em todas as páginas"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/pt-BR/OrchardCore.Features.po b/Localization/pt-BR/OrchardCore.Features.po
index d488501ff1b0a..c1e83995dba60 100644
--- a/Localization/pt-BR/OrchardCore.Features.po
+++ b/Localization/pt-BR/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Recursos"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Por favor, selecione um ou mais recursos."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} era {1}."
@@ -125,9 +125,9 @@ msgstr "Ações em lote"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Desativar"
@@ -136,8 +136,8 @@ msgstr "Desativar"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Habilitar"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Sem categoria"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Desativar o recurso {0} também desativará os seguintes recursos dependentes:{1} Continuar?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Desativar recurso"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Sim"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Não"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Nada aqui!</strong> Sua pesquisa não retornou resultados."
diff --git a/Localization/pt-BR/OrchardCore.Flows.po b/Localization/pt-BR/OrchardCore.Flows.po
index fc8661b39aec4..3e43cf488b771 100644
--- a/Localization/pt-BR/OrchardCore.Flows.po
+++ b/Localization/pt-BR/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Adicionar Item"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Os tipos de conteúdo que esta coleção pode conter, por exemplo, Slide para um Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Inserir Widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Excluir"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Tem certeza que deseja remover este item?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/pt-BR/OrchardCore.Forms.po b/Localization/pt-BR/OrchardCore.Forms.po
index 17fddccf9d323..4192e908918b8 100644
--- a/Localization/pt-BR/OrchardCore.Forms.po
+++ b/Localization/pt-BR/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "As opções estão escritas em um formato incorreto."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Adicionar tarefa de validação de erro de modelo"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validação"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Vincular tarefa do estado do modelo"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validação"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Tarefa de Validação do Antiforgery Token"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validação"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Inválido"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Tarefa de validação de campo de formulário"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validação"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Inválido"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Tarefa de Validação de Formulário"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validação"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Inválido"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "O nome do campo de formulário que tem um valor inválido."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Vincular campos de formulário enviados ao estado do modelo."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "O texto a ser exibido no botão."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "O tipo de botão."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "O ID a ser renderizado neste elemento de formulário."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "O nome para renderizar este elemento de formulário."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "A URL para onde enviar o formulário."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "O método HTTP utilizado ao enviar o formulário."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Selecione para gerar um Token Anti Forgery no formulário."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "O tipo de botão."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Texto a ser exibido quando o campo não tem nenhum valor."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "O valor padrão para este campo."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Editar dados"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Uma representação JSON dos valores permitidos, por exemplo, {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "O texto a ser exibido quando o campo de texto não tem nenhum valor."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Validar <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "O nome do campo do formulário para validar."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Verifica se o formulário enviado contém algum erro de validação."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/pt-BR/OrchardCore.GitHub.po b/Localization/pt-BR/OrchardCore.GitHub.po
index 0b5fe0dd87148..cac25f9e536bf 100644
--- a/Localization/pt-BR/OrchardCore.GitHub.po
+++ b/Localization/pt-BR/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Configurações de autenticação do GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "O Client ID definido na guia geral do seu <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "O secret para seu aplicativo."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/pt-BR/OrchardCore.Google.po b/Localization/pt-BR/OrchardCore.Google.po
index a160e090f8e6f..509ed5afae92f 100644
--- a/Localization/pt-BR/OrchardCore.Google.po
+++ b/Localization/pt-BR/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Configurações do Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Configurações de autenticação Google"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "A identificação do cliente definida no console de API do Google para o aplicativo."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "O client secret definido no console do Google API para a aplicação."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/pt-BR/OrchardCore.Html.po b/Localization/pt-BR/OrchardCore.Html.po
index 795d3fb4025d9..d3889e1036b24 100644
--- a/Localization/pt-BR/OrchardCore.Html.po
+++ b/Localization/pt-BR/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor de texto Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "O corpo do item de conteúdo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Digite as opções do editor"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentação para opções"
diff --git a/Localization/pt-BR/OrchardCore.Https.po b/Localization/pt-BR/OrchardCore.Https.po
index 27e9b56d8da6b..6a78ab6716d78 100644
--- a/Localization/pt-BR/OrchardCore.Https.po
+++ b/Localization/pt-BR/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Especifica se um redirecionamento permanente (308 Moved Permanently) deve ser usado em vez de um redirecionamento temporário (307 Found) ao redirecionar para HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/pt-BR/OrchardCore.Infrastructure.Abstractions.po b/Localization/pt-BR/OrchardCore.Infrastructure.Abstractions.po
index 4e967729a3a77..175c36c114171 100644
--- a/Localization/pt-BR/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/pt-BR/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/pt-BR/OrchardCore.Layers.po b/Localization/pt-BR/OrchardCore.Layers.po
index 7ceb02630b23a..519847bdcaaa6 100644
--- a/Localization/pt-BR/OrchardCore.Layers.po
+++ b/Localization/pt-BR/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Criar layer"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Descrição"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Editar layer - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Editar Widgets e Layers"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget movido com sucesso. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Desfazer</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zonas"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Por favor <a href=\"{0}\">defina as zonas disponíveis</a> antes de adicionar Widgets"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Adicionar Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Selecione uma layer para exibir seus widgets associados."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Editar"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Excluir"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Por favor <a href=\"{0}\">crie uma layer</a> antes de adicionar Widgets"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Adicionar"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Se marcado, o título será renderizado com o widget."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "A Layer que o widget deve estar associado."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/pt-BR/OrchardCore.Liquid.po b/Localization/pt-BR/OrchardCore.Liquid.po
index 65790c8ceec1e..9e99ec1e7bc91 100644
--- a/Localization/pt-BR/OrchardCore.Liquid.po
+++ b/Localization/pt-BR/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/pt-BR/OrchardCore.Lists.po b/Localization/pt-BR/OrchardCore.Lists.po
index 26cd34fe0c363..d0ff9aa8f6053 100644
--- a/Localization/pt-BR/OrchardCore.Lists.po
+++ b/Localization/pt-BR/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Representa um link para o item de conteúdo pai e a ordem que o item de conteúdo é representado."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Representa uma coleção de itens de conteúdo."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "O post especificado não existe mais. Por favor, crie um novo post do blog."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Sem autorização para excluir este conteúdo"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "O nome de usuário ou e-mail ou senha fornecida estão incorretos."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "A lista está vazia"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "O feed atual está disponível em <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Marque esta opção para habilitar a ordenação manual de itens."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Listas"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Adicionar item de menu pai"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/pt-BR/OrchardCore.Localization.po b/Localization/pt-BR/OrchardCore.Localization.po
index 1569655e61513..c0ff8945cf3b0 100644
--- a/Localization/pt-BR/OrchardCore.Localization.po
+++ b/Localization/pt-BR/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Idiomas"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Um idioma é obrigatório"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Os idiomas ativos configurados para o site."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Adicionar idioma"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/pt-BR/OrchardCore.Markdown.po b/Localization/pt-BR/OrchardCore.Markdown.po
index a3d05f7615937..2e4330d52da20 100644
--- a/Localization/pt-BR/OrchardCore.Markdown.po
+++ b/Localization/pt-BR/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor de texto Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "O corpo do item de conteúdo, no formato Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor de texto Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pt-BR/OrchardCore.Media.po b/Localization/pt-BR/OrchardCore.Media.po
index ac56246e86a34..f527a197d7671 100644
--- a/Localization/pt-BR/OrchardCore.Media.po
+++ b/Localization/pt-BR/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Não é possível mover a mídia porque já existe um arquivo com o mesmo nome"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Um perfil com o mesmo nome já existe."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Padrão"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Tamanho personalizado"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Padrão (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Máx"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Recortar"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Preencher"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Mín"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Estender"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Houve um erro ao manipular os arquivos."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Se deseja obter os assets do diretório superior ou de todos os subdiretórios também."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Criar perfil de mídia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "O nome do perfil de mídia."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "A dica para o perfil de mídia."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Editar perfil de mídia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "O nome do perfil de mídia."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "A dica para o perfil de mídia."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Inverter"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Criar Pasta"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Renomear Item"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Mídia"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Exporta todas ou mídia especificada."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Miniaturas pequenas"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Miniaturas grandes"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Anexado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Miniaturas pequenas"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Miniaturas grandes"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Selecionar mídia"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pt-BR/OrchardCore.Menu.po b/Localization/pt-BR/OrchardCore.Menu.po
index cd439716eb6a6..e7aa8769d9a35 100644
--- a/Localization/pt-BR/OrchardCore.Menu.po
+++ b/Localization/pt-BR/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Editar {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/pt-BR/OrchardCore.Microsoft.Authentication.po b/Localization/pt-BR/OrchardCore.Microsoft.Authentication.po
index 4f81927a1545b..a7777ac329438 100644
--- a/Localization/pt-BR/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/pt-BR/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Configurações de autenticação de Conta Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "O ID do aplicativo encontrado nos parâmetros do portal do desenvolvedor do Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "A chave secreta do aplicativo encontrada nos parâmetros do portal do desenvolvedor da Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/pt-BR/OrchardCore.Navigation.po b/Localization/pt-BR/OrchardCore.Navigation.po
index 1e3eaafde3df8..4964fe5d7db8e 100644
--- a/Localization/pt-BR/OrchardCore.Navigation.po
+++ b/Localization/pt-BR/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/pt-BR/OrchardCore.Notifications.po b/Localization/pt-BR/OrchardCore.Notifications.po
index bc749287adca7..f9f304ce7903e 100644
--- a/Localization/pt-BR/OrchardCore.Notifications.po
+++ b/Localization/pt-BR/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/pt-BR/OrchardCore.OpenId.po b/Localization/pt-BR/OrchardCore.OpenId.po
index 29b624bb55002..3259204259b13 100644
--- a/Localization/pt-BR/OrchardCore.OpenId.po
+++ b/Localization/pt-BR/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "O nome já está em uso por outro escopo."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Configuração do servidor OpenID atualizada com sucesso."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Configuração de validação OpenID atualizada com sucesso."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Criar um novo aplicativo"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Client ID"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Nome de exibição"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Aplicativos confidenciais DEVEM enviar seu segredo de cliente ao se comunicar com o token e pontos de revogação. Isso garante que somente o cliente legito pode trocar um código de autorização ou obter um token de atualização."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Permitir fluxo de atualização de token"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Permitir Endpoint de Logout"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Criar um novo escopo"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Nome de exibição"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Nota: o tenant do servidor está sempre incluído no arquivo de token de acesso, mesmo que nenhum escopo seja solicitado."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Editar uma aplicativo"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Client ID"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Nome de exibição"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Aplicativos confidenciais DEVEM enviar seu segredo de cliente ao se comunicar com o token e pontos de revogação. Isso garante que somente o cliente legito pode trocar um código de autorização ou obter um token de atualização."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Permitir fluxo de atualização de token"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Editar um escopo"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Nome de exibição"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Nota: o tenant do servidor está sempre incluído no arquivo de token de acesso, mesmo que nenhum escopo seja solicitado."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "O tenant atual será recarregado quando as configurações forem salvas."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Nome de Exibição IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Autoridade para usar ao fazer chamadas OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "o 'cliente_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "O endereço da requisição, no contexto do endereço base da aplicação, para onde o navegador será redirecionado. O sistema processará esta requisição quando chegar."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Ver post_logout_redirect_uri de "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "O URI para o qual navegador será redirecionado após o aplicativo terminar a sessão do provedor de identidade. O redirecionamento ocorrerá após o SignedOutbackPath ser invocado."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Fluxo de autenticação de código"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "ver: "
@@ -1217,15 +1217,15 @@ msgstr "Usar tipo de resposta 'code'"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "exemplo:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Usar tipo de resposta 'code token'"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Fluxo de autenticação implícita"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Usar tipo de resposta 'id_token'"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Usar tipo de resposta 'id_token token'"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Modo de resposta"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Configurar modo de resposta veja: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "defina o segredo do cliente."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Estas opções são todas opcionais e são apenas para usuários avançados."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "A URL base do servidor de identidade (este site). Se nenhum for fornecido, um valor padrão baseado no host do site é calculado automaticamente."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "Selecione a localização do certificado de criptografia."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Você precisa adicionar um certificado ao seu servidor para configurar o módulo OpenID Connect."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "Quando esta opção está ativada, os tokens de atualização não são marcados como resgatados e podem ser reutilizados até que expirem."
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "O tenant atual será recarregado quando as configurações forem salvas."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Tenant do servidor de autorização"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "O endereço do servidor remoto do OpenID Connect. Usar um endereço HTTPS é altamente recomendado."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/pt-BR/OrchardCore.Placements.po b/Localization/pt-BR/OrchardCore.Placements.po
index 696f9e4cdf369..1f45d5909d842 100644
--- a/Localization/pt-BR/OrchardCore.Placements.po
+++ b/Localization/pt-BR/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/pt-BR/OrchardCore.ProjectTemplates.po b/Localization/pt-BR/OrchardCore.ProjectTemplates.po
index 828e2a3b097ab..e6f72ff90bf89 100644
--- a/Localization/pt-BR/OrchardCore.ProjectTemplates.po
+++ b/Localization/pt-BR/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Exibir"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/pt-BR/OrchardCore.PublishLater.po b/Localization/pt-BR/OrchardCore.PublishLater.po
index 8da01140b3a0d..5769b9b194153 100644
--- a/Localization/pt-BR/OrchardCore.PublishLater.po
+++ b/Localization/pt-BR/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publicar mais Tarde"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Cancelar Publicar Mais Tarde"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/pt-BR/OrchardCore.Queries.po b/Localization/pt-BR/OrchardCore.Queries.po
index c86cb613ff941..c60e3c4bc24f2 100644
--- a/Localization/pt-BR/OrchardCore.Queries.po
+++ b/Localization/pt-BR/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Executar consulta SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Ocorreu um erro ao executar a consulta SQL: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "Consulta SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "A consulta SQL usa a sintaxe padrão SQL92 e é convertida com base no banco de dados atual. O prefixo das tabelas será aplicado automaticamente."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Consulta"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "O nome técnico da consulta."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Quando marcado, o resultado tem de ser uma lista de ids do documento."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/pt-BR/OrchardCore.ReCaptcha.Core.po b/Localization/pt-BR/OrchardCore.ReCaptcha.Core.po
index 0458d76fbc16e..7949c3de4df26 100644
--- a/Localization/pt-BR/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/pt-BR/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2021-07-15 18:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Falha ao validar o captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Falha ao validar o captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Idioma com o nome {0} não encontrado"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/pt-BR/OrchardCore.ReCaptcha.po b/Localization/pt-BR/OrchardCore.ReCaptcha.po
index 401ac0f808f68..281d761674869 100644
--- a/Localization/pt-BR/OrchardCore.ReCaptcha.po
+++ b/Localization/pt-BR/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Exporta as configurações do ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Tarefa d validação ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Validação"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Inválido"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "A validação do Captcha falhou. Tente novamente."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "O tenant atual será recarregado quando as configurações forem salvas."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Chave do seu site Google reCaptcha."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/pt-BR/OrchardCore.Recipes.Core.po b/Localization/pt-BR/OrchardCore.Recipes.Core.po
index 8a6d17ba1ebf1..05e653c1c673c 100644
--- a/Localization/pt-BR/OrchardCore.Recipes.Core.po
+++ b/Localization/pt-BR/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/pt-BR/OrchardCore.Roles.po b/Localization/pt-BR/OrchardCore.Roles.po
index d4b60ffc3605e..153e7ab382bf5 100644
--- a/Localization/pt-BR/OrchardCore.Roles.po
+++ b/Localization/pt-BR/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Funções"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Nome da função inválido."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Função atualizada com sucesso."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Não é possível excluir funções do sistema."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Criar Função"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Nome da função"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Editar detalhes da função"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Permissão"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Esta permissão pode permitir que um usuário eleve suas outras permissões. Conceda com extremo cuidado."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Funções"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/pt-BR/OrchardCore.Rules.po b/Localization/pt-BR/OrchardCore.Rules.po
index bfcd82f27b084..ef8153ad2888d 100644
--- a/Localization/pt-BR/OrchardCore.Rules.po
+++ b/Localization/pt-BR/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/pt-BR/OrchardCore.Search.Elasticsearch.po b/Localization/pt-BR/OrchardCore.Search.Elasticsearch.po
index 3a81dff79d6ee..2cd7b6400f766 100644
--- a/Localization/pt-BR/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/pt-BR/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/pt-BR/OrchardCore.Search.Lucene.po b/Localization/pt-BR/OrchardCore.Search.Lucene.po
index 0bb25db38ece0..10ca92dd8a292 100644
--- a/Localization/pt-BR/OrchardCore.Search.Lucene.po
+++ b/Localization/pt-BR/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/pt-BR/OrchardCore.Search.po b/Localization/pt-BR/OrchardCore.Search.po
index 4c5595e060ac9..d9b203fdf2560 100644
--- a/Localization/pt-BR/OrchardCore.Search.po
+++ b/Localization/pt-BR/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/pt-BR/OrchardCore.Security.po b/Localization/pt-BR/OrchardCore.Security.po
index a3173dddad3f9..d41886b17f92b 100644
--- a/Localization/pt-BR/OrchardCore.Security.po
+++ b/Localization/pt-BR/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2022-06-01 18:43\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/pt-BR/OrchardCore.Seo.po b/Localization/pt-BR/OrchardCore.Seo.po
index 98076102848d0..df32d493dcdf9 100644
--- a/Localization/pt-BR/OrchardCore.Seo.po
+++ b/Localization/pt-BR/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/pt-BR/OrchardCore.Settings.po b/Localization/pt-BR/OrchardCore.Settings.po
index e1e73c95a2b1a..53627a6e6b671 100644
--- a/Localization/pt-BR/OrchardCore.Settings.po
+++ b/Localization/pt-BR/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Configurações do site atualizadas com sucesso."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "A URL Base deve ser uma URL totalmente qualificada."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Configurações do site"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/pt-BR/OrchardCore.Setup.Core.po b/Localization/pt-BR/OrchardCore.Setup.Core.po
index f7568a1ac453f..3201d6311419a 100644
--- a/Localization/pt-BR/OrchardCore.Setup.Core.po
+++ b/Localization/pt-BR/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/pt-BR/OrchardCore.Setup.po b/Localization/pt-BR/OrchardCore.Setup.po
index 6522d54ab97ac..fbcc747bdfad4 100644
--- a/Localization/pt-BR/OrchardCore.Setup.po
+++ b/Localization/pt-BR/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "A senha deve ter pelo menos {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Não é possível criar um site sem um modelo de site."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Isto é usado como o título padrão das suas páginas."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Modelos de site permitem que você crie seu site com opções, recursos e configurações pré-definidas."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Determina o fuso horário padrão usado ao exibir e editar datas e horários."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "O banco de dados é usado para armazenar a configuração do site e seu conteúdo."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Você pode especificar um prefixo de tabela se você pretende reutilizar o mesmo banco de dados para vários sites."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Mostrar/ocultar string de conexão"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "O super usuário tem todas permissões. Ele deve ser usado apenas durante a configuração e para recuperação do site."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Usuário"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "O email é inválido."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Força da senha"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/pt-BR/OrchardCore.Shortcodes.po b/Localization/pt-BR/OrchardCore.Shortcodes.po
index 2b8e313591b30..21763f897ddc7 100644
--- a/Localization/pt-BR/OrchardCore.Shortcodes.po
+++ b/Localization/pt-BR/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "O conteúdo do template é obrigatório."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O template não contém uma expressão de Liquid válida. Detalhes: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/pt-BR/OrchardCore.Sitemaps.po b/Localization/pt-BR/OrchardCore.Sitemaps.po
index 21a3510e91684..949f4490707d3 100644
--- a/Localization/pt-BR/OrchardCore.Sitemaps.po
+++ b/Localization/pt-BR/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "A propriedade 'Base url' das configurações do site está vazia, mas é necessária para gerar sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "A propriedade 'Base url' das configurações do site está vazia, mas é necessária para gerar sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Desmarque para desabilitar roteamento para este sitemap."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "A propriedade 'Base url' das configurações do site está vazia, mas é necessária para gerar sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "A propriedade 'Base url' das configurações do site está vazia, mas é necessária para gerar sitemaps."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Desmarque para desabilitar roteamento para este sitemap."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Selecione para não exibir este item de conteúdo no sitemap."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "A frequência que este item de conteúdo provavelmente irá mudar."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/pt-BR/OrchardCore.Sms.po b/Localization/pt-BR/OrchardCore.Sms.po
index 61fb25eb0d0bf..c27cf749701eb 100644
--- a/Localization/pt-BR/OrchardCore.Sms.po
+++ b/Localization/pt-BR/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/pt-BR/OrchardCore.Spatial.po b/Localization/pt-BR/OrchardCore.Spatial.po
index 3f6370bfcfa41..08352194c6192 100644
--- a/Localization/pt-BR/OrchardCore.Spatial.po
+++ b/Localization/pt-BR/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pt-BR/OrchardCore.Taxonomies.po b/Localization/pt-BR/OrchardCore.Taxonomies.po
index 16259b54465de..326bec90e6cea 100644
--- a/Localization/pt-BR/OrchardCore.Taxonomies.po
+++ b/Localization/pt-BR/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "É obrigatório um valor para '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "A taxonomia não pôde ser encontrada. Por favor, verifique as configurações para este campo."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Erro ao criar tag"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Digite para pesquisar"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Selecionar"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Excluir"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Pressione enter para criar uma tag"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Nenhuma tag encontrada"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "A taxonomia não pôde ser encontrada. Por favor, verifique as configurações para este campo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "O texto da dica para este campo que será exibido no editor."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonomia"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Obrigatório"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Se ao menos um elemento está selecionado."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Único"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Se apenas um elemento pode ser selecionado."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Somente termos filhos"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Se os termos filhos são os únicos itens que podem ser selecionados."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Se novas tags podem ser criadas ao digitar. Nota: Ao criar tags digitando, apenas a propriedade do termo de exibição será definida."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Tipo de Conteúdo Termo"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Adicionar {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Você reordenou a taxonomia."
diff --git a/Localization/pt-BR/OrchardCore.Templates.Cms.Module.po b/Localization/pt-BR/OrchardCore.Templates.Cms.Module.po
index 98977db06d82c..8e7d07c35a086 100644
--- a/Localization/pt-BR/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/pt-BR/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Exibir"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/pt-BR/OrchardCore.Templates.po b/Localization/pt-BR/OrchardCore.Templates.po
index 1f062ce398968..4b290a62d074f 100644
--- a/Localization/pt-BR/OrchardCore.Templates.po
+++ b/Localization/pt-BR/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "O modelo \"{0}\" foi criado."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Pré-visualização"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "O nome do template."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "A descrição do template."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Pré-visualização"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "O nome do template."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "A descrição do template."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/pt-BR/OrchardCore.Tenants.po b/Localization/pt-BR/OrchardCore.Tenants.po
index aaa95f54809e8..427eac470511e 100644
--- a/Localization/pt-BR/OrchardCore.Tenants.po
+++ b/Localization/pt-BR/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Todos os status"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Em execução"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Desativado"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Não inicializado"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Nome"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Status"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Desativar"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Ativar"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Você não pode desativar o tenant padrão."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "O tenant '{0}' já está desativado."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "O tenant '{0}' já está habilitado."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Você só pode ativar um tenant desativado."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Tenant não encontrado: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "O Tentant não pode ser configurado."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "O provedor de banco de dados não está definido."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "A string de conexão é necessária para este provedor de banco de dados."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "'Modelo do Site' ou 'Nome do Modelo do Site' é obrigatório."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Modelo de site '{0}' não encontrado."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Criar Tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Criar Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Selecione o nome do tenant para criar."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Opcional) a descrição do tenant a ser criado."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Exemplo: Se o servidor for \"orchardproject.net\", o URL do site do inquilino é \"http://orchardproject.net/\". Com suporte ao Liquid."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Que tipo de banco de dados utilizar?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Prefixo de tabela"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "String de conexão"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Modelo de Site"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Desativar Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Editar tenant"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Ativar tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Ativa um tenant."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Configurar Tenant"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Selecione o nome do tenant para ser configurado."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Nome do site"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Usuário administrador"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "E-mail do administrador"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Senha de administrador"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Que tipo de banco de dados utilizar?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Prefixo de tabela"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "String de conexão"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/pt-BR/OrchardCore.Tests.po b/Localization/pt-BR/OrchardCore.Tests.po
index ade7e10375124..1ece7635ab9da 100644
--- a/Localization/pt-BR/OrchardCore.Tests.po
+++ b/Localization/pt-BR/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/pt-BR/OrchardCore.Themes.po b/Localization/pt-BR/OrchardCore.Themes.po
index 06489d3481f93..8a903fe0cd83d 100644
--- a/Localization/pt-BR/OrchardCore.Themes.po
+++ b/Localization/pt-BR/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exporta o tema do site e o tema admin do site atualmente selecionados."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/pt-BR/OrchardCore.Title.po b/Localization/pt-BR/OrchardCore.Title.po
index dc1dff73684ec..6e3848c0ba276 100644
--- a/Localization/pt-BR/OrchardCore.Title.po
+++ b/Localization/pt-BR/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O modelo não contém uma expressão Liquid válida. Detalhes: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Padrão"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Marque para renderizar o título nas exibições de visualização."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt-BR/OrchardCore.Twitter.po b/Localization/pt-BR/OrchardCore.Twitter.po
index a79aa10c545bd..6556a13a294a4 100644
--- a/Localization/pt-BR/OrchardCore.Twitter.po
+++ b/Localization/pt-BR/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Access Token Secret é obrigatório"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Tarefa de atualização de status do Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Mídias sociais"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Falhou"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "O tenant atual será recarregado quando as configurações forem salvas."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Configurações de Integração do Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Chave de API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "A chave de API definida na aba Chaves e Tokens do painel de aplicativos do twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Chave secreta da API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "A chave secreta da API definida na aba Chaves e Tokens do painel de aplicativos do twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Token de Acesso"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "O token de acesso definido na aba Chaves e Tokens do painel de aplicativos do twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Senha do token de acesso"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "A senha do token de acesso definida na aba Chaves e Tokens do painel de aplicativos do twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Configurações do Entrar com Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Atualizar Status do Twitter"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/pt-BR/OrchardCore.Users.Core.po b/Localization/pt-BR/OrchardCore.Users.Core.po
index 6153398372cfd..fd1f1bab05131 100644
--- a/Localization/pt-BR/OrchardCore.Users.Core.po
+++ b/Localization/pt-BR/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-mail '{0}' é inválido."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Erro inesperado: '{0}'."
diff --git a/Localization/pt-BR/OrchardCore.Users.po b/Localization/pt-BR/OrchardCore.Users.po
index d1744eb386541..231d8ef20bec8 100644
--- a/Localization/pt-BR/OrchardCore.Users.po
+++ b/Localization/pt-BR/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Usuário criado com sucesso"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "O login local está desativado."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "A conta está bloqueada"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Tentativa de login inválida."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Ocorreu um erro no provedor externo."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Site não permite registro de usuários."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Confirme sua conta"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "O usuário informado não tem permissão para iniciar sessão."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Você deve confirmar seu e-mail."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Todos os Usuários"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Habilitar Usuários"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Desativar usuários"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nome"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Aprovar"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Ativar"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Desativar"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Excluir"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Todas as funções"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Autenticado (sem papéis)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Usuário {0} aprovado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Usuário {0} excluído com sucesso."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Usuário {0} desativado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Usuário {0} ativado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Usuário criado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Usuário atualizado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Usuário excluído com sucesso."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Não foi possível excluir o usuário."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Senha atualizada com sucesso."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Desbloqueado com sucesso."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Não foi possível excluir o usuário."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Configurações de login"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exporta as configurações de login."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Configurações de alteração de e-mail"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exporta as configurações de alteração de e-mail."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Configurações de cadastro"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exporta as configurações de cadastro."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Configurações de redefinição de senha"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exporta as configurações de redefinição de senha."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "A nova senha e a confirmação de senha não correspondem."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Tarefa de Atribuição de função de usuário"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Usuário"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Falhou"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Tarefa de Cadastro de usuário"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Válido"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Inválido"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Nenhum serviço de e-mail está disponível"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Evento de usuário atualizado"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Usuário"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Tarefa de Validação de Usuário"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anônimo"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Autenticado"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Com a função"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} para o papel {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "O usuário a ser atribuído. Com suporte do Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Alterar senha"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Senha atual"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nova Senha"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Criar Usuário"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Alterar Senha"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nova Senha"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Alterar Email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Você autenticou com sucesso como <strong>{0}</strong>. Você já tem uma conta com este endereço de e-mail. Digite a senha da sua conta local e clique no botão Registrar para vincular as contas e finalizar o acesso."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Usuário"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Iniciar sessão"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Criar uma nova conta."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Usuário"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Senha"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Você autenticou com sucesso com <strong>{0}</strong>. Por favor, preencha o formulário abaixo e clique no botão Cadastrar para completar o cadastro."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Usuário"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Senha"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Enviar email de confirmação"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "O assunto da mensagem. Com suporte a sintaxe do Liquid."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Redefinir Senha"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nova senha"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "O usuário foi desativado."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Usuário foi ativado."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Desmarque para desativar esta conta de usuário."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Definir a propriedade do fluxo de trabalho 'UserName' se o usuário estiver autenticado"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Funções"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "A saída 'Com a Função' será acionada se o usuário tiver pelo menos uma das funções selecionadas."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/pt-BR/OrchardCore.Widgets.po b/Localization/pt-BR/OrchardCore.Widgets.po
index c6b2f50578610..56a6dc19e51c9 100644
--- a/Localization/pt-BR/OrchardCore.Widgets.po
+++ b/Localization/pt-BR/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Adicionar Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/pt-BR/OrchardCore.Workflows.po b/Localization/pt-BR/OrchardCore.Workflows.po
index 4fb9122d30289..7b6297d175abb 100644
--- a/Localization/pt-BR/OrchardCore.Workflows.po
+++ b/Localization/pt-BR/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Tarefa de efetivar transação"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Tarefa Correlacionada"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Primitivos"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Para cada tarefa"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Iterar"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Bifurcar Tarefa"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Tarefa de laço Para"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Iterar"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Tarefa Se Senão"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Verdadeiro"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Falso"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Tarefa de Combinação"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Combinado"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Tarefa de Log"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Primitivos"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Concluído"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Exceções"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Tarefa de Notificação"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Interface do usuário"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Tarefa de script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Definir tarefa de saída"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Primitivos"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Tarefa de Definição de Propriedade"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Primitivos"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Tarefa de laço Enquanto"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Fluxo de controle"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Iterar"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Concluído"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Criado recentemente"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Menos recentemente criado"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Falhou"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Concluído"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Excluir"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "O Workflow {0} foi excluído."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Excluir"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "O Workflow {0} foi excluído."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Tarefa de Redirecionamento HTTP"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Evento de Requisição HTTP"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Concluído"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Correspondido"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Tarefa de Requisição HTTP"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Status HTTP não tratado"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Tarefa de resposta HTTP"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Concluído"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Tarefa Inicial"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Editar"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Adicionar"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Correlação"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Voltar"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Excluir"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Eventos Disponíveis"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Tarefas Disponíveis"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Tem certeza que deseja excluir esta atividade?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtrar"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Iterar <em>{0}</em> em <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "A lista para iterar. Com suporte a JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Sem bifurcações"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Iterar <em>{0}</em> de <em>{1}</em> para <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "O valor inicial. Com suporte a JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "O valor final. Com suporte a JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "O valor da iteração. Com suporte a JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Redirecionamento HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "A URL para redirecionar. Com suporte ao Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Permanente"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Selecione se o redirecionamento deve ser permanente (301). Deixe desmarcado para um redirecionamento temporário (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Tratar requisição HTTP de entrada"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Qualquer um que invocar esta URL acionará este fluxo de trabalho. Armazene em um lugar seguro."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Validar Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Desmarque essa opção se a requisição vem de um serviço que chama essa URL como um webhook. Se esta URL é solicitada a partir de um formulário, então mantenha esta opção marcada para garantir que os valores do formulário não tenham sido adulterados."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Tempo de vida do Token"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Aperte o botão <b>Gerar novamente</b> após alterar este valor."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Número de dias para expirar o token. Zero para o token nunca expirar"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Filtrar requisição HTTP de entrada"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "O método HTTP a ser correspondido."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "O nome do controller a ser correspondido."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "O nome da ação a ser correspondido."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "A URL para enviar a solicitação. Suporta a sintaxe do Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "O Método HTTP. Por exemplo: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "O tipo de conteúdo do corpo da solicitação."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "O corpo para enviar com solicitações POST, PUT e PATCH. Com suporte ao Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Fornecer cabeçalhos HTTP adicionais, um por linha. Por exemplo: Authorization: Bearer 123ABC. Com suporte ao Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "Resposta HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "O Código de Status HTTP para retornar. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Clique aqui</a> para uma lista completa."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "O tipo de conteúdo do corpo de resposta."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "O corpo a ser retornado. Com o suporte ao Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Avaliar <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Ordenação"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Excluir"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Criado em {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Nada aqui!</strong> Não exister nenhum fluxo de trabalho interrompido no momento."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Voltar"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "selecionado"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Desativado"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 instância"
-msgstr[1] "{0} instâncias"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Aguarda <strong>qualquer</strong> atividade de entrada antes de se juntar a execução em um único caminho."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "O nível de log."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} notificações"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "O tipo da notificação."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Uma lista separada por vírgulas de resultados disponíveis."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Retorno via {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "O nome para onde será retornado."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Atribuir propriedade {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "A propriedade a ser atribuída. Se a propriedade especificada ainda não existir, ela será criada."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Quando <em>{0}</em> for acionado"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Nenhuma ação de usuário especificada"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Digite um ou mais nomes de ações separadas por vírgulas."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Executa enquanto <em>{0}</em> é verdadeiro"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Iterar enquanto uma condição for verdadeira."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/pt-BR/TheAdmin.po b/Localization/pt-BR/TheAdmin.po
index 4ef6ad16787b6..7a08ef33aeae6 100644
--- a/Localization/pt-BR/TheAdmin.po
+++ b/Localization/pt-BR/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Modo escuro"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Recolher / expandir menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Excluir"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Tem certeza de que deseja remover este elemento?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/pt-BR/TheAgencyTheme.po b/Localization/pt-BR/TheAgencyTheme.po
index b100279fb7da5..692e4e30ae2d3 100644
--- a/Localization/pt-BR/TheAgencyTheme.po
+++ b/Localization/pt-BR/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Nenhum resultado encontrado."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "A página solicitada não foi encontrada."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/pt-BR/TheBlogTheme.po b/Localization/pt-BR/TheBlogTheme.po
index e8bb2c351c17e..2e2999ab87415 100644
--- a/Localization/pt-BR/TheBlogTheme.po
+++ b/Localization/pt-BR/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "em {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Nenhum resultado encontrado."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Página não encontrada"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/pt-BR/TheTheme.po b/Localization/pt-BR/TheTheme.po
index f75d185de8097..9df2bbfa1c22e 100644
--- a/Localization/pt-BR/TheTheme.po
+++ b/Localization/pt-BR/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/pt/OrchardCore.Admin.po b/Localization/pt/OrchardCore.Admin.po
index 5fd804520f6ee..3874d72f60ef1 100644
--- a/Localization/pt/OrchardCore.Admin.po
+++ b/Localization/pt/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Administração"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Definições de administração"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exportar as configurações de administrador."
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Utilize o menu para descobrir todas as suas potencialidades."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Administração"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/pt/OrchardCore.AdminDashboard.po b/Localization/pt/OrchardCore.AdminDashboard.po
index 561f34b10ebe1..50641706f3d41 100644
--- a/Localization/pt/OrchardCore.AdminDashboard.po
+++ b/Localization/pt/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/pt/OrchardCore.AdminMenu.po b/Localization/pt/OrchardCore.AdminMenu.po
index 0110e012f868e..8ce5844a45d94 100644
--- a/Localization/pt/OrchardCore.AdminMenu.po
+++ b/Localization/pt/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Criar Menu de administração {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Nome"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Criar Item"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Editar Menu de Administração: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Nome"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Editar Item"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "A prioridade deste link a ser exibido como ativo, em vez de outro, quando ambos tiverem o mesmo url. O link com o maior valor tem o status ativo na navegação."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "A ordem de posição deste link no menu de administração."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Hiperligação"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "O texto do hyperlink como ele será mostrado na árvore."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "O url do link. Um link será exibido apenas se ele ou um dos seus filhos tiver um url. O url será relativo à raiz do site de administração"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Seleccionar ícone"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Espaço reservado (placeholder)"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "O texto do item de menu que será exibido na árvore."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Escolha"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Selecione um ícone para exibir quando este item de menu está no primeiro nível."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Seleccionar ícone"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Alias.po b/Localization/pt/OrchardCore.Alias.po
index 7f4e3bc079513..c232801186007 100644
--- a/Localization/pt/OrchardCore.Alias.po
+++ b/Localization/pt/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O padrão não contém uma expressão Liquid válida. Detalhes: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Deixe em branco para o regenerar."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "O alias é gerado automáticamente e o input está desativado"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt/OrchardCore.ArchiveLater.po b/Localization/pt/OrchardCore.ArchiveLater.po
index b73e8844f2552..38520cb2ca06b 100644
--- a/Localization/pt/OrchardCore.ArchiveLater.po
+++ b/Localization/pt/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/pt/OrchardCore.AuditTrail.po b/Localization/pt/OrchardCore.AuditTrail.po
index db8f28c1b3544..f0efdd67bc6af 100644
--- a/Localization/pt/OrchardCore.AuditTrail.po
+++ b/Localization/pt/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/pt/OrchardCore.Autoroute.po b/Localization/pt/OrchardCore.Autoroute.po
index 95a304e1b0e36..92f9fb5172b4b 100644
--- a/Localization/pt/OrchardCore.Autoroute.po
+++ b/Localization/pt/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Marque para desativar o autoroute para este conteúdo."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Marque para especificar que um conteúdo filho será encaminhado para um caminho absoluto."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt/OrchardCore.BackgroundTasks.po b/Localization/pt/OrchardCore.BackgroundTasks.po
index 9caadcf5149de..030ee8e3427c8 100644
--- a/Localization/pt/OrchardCore.BackgroundTasks.po
+++ b/Localization/pt/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/pt/OrchardCore.ContentFields.po b/Localization/pt/OrchardCore.ContentFields.po
index 8ff50529184b7..32196638a34fd 100644
--- a/Localization/pt/OrchardCore.ContentFields.po
+++ b/Localization/pt/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Dica a exibir para este campo no editor."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Não há conteúdos."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Não publicado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Escreva para pesquisar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Selecionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Remover"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenhum resultado encontrado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Permitir a seleção de vários elementos."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Exibir todos os Tipos de Conteúdo"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Os tipos de conteúdo a exibir. Escolha pelo menos um."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Dica a exibir para este campo no editor."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Localizado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o valor for obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Dica a exibir para este campo no editor."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o valor for obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Documentação para as opções"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Texto do link"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Se o url for obrigatório."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Usar o url do link"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Dica a exibir para o url no editor."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "A dica a exibir para o texto do link no editor."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Uma dica (placeholder) a exibir quando o input do url estiver vazio."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Uma dica (placeholder) a exibir quando o input de texto estiver vazio."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "O url válido proposto ao criar um conteúdo."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Não há conteúdos."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Não publicado"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Escreva para pesquisar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Selecionar"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Remover"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenhum resultado encontrado"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Permitir a seleção de vários elementos."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Os tipos de conteúdo a exibir. Escolha pelo menos um."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Intervalo"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Nenhum"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o valor for obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Dica a exibir para este campo no editor."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Dica a exibir quando o input está vazio. (opcional)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "O número de dígitos à direita do separador decimal."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "O valor mínimo permitido. (opcional)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "O valor máximo permitido. (opcional)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Editar Data"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Uma representação JSON dos valores permitidos, por exemplo, {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o valor for obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Dica a exibir para este campo no editor."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Se o valor for obrigatório."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Obrigatório"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Se o valor for obrigatório."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Dica"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Dica a exibir para este campo no editor."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Largura"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Largura da Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Altura"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "A altura da Videobox"
diff --git a/Localization/pt/OrchardCore.ContentLocalization.po b/Localization/pt/OrchardCore.ContentLocalization.po
index 5c9c3c3c7002c..5ff7e7391f6d5 100644
--- a/Localization/pt/OrchardCore.ContentLocalization.po
+++ b/Localization/pt/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/pt/OrchardCore.ContentPreview.po b/Localization/pt/OrchardCore.ContentPreview.po
index d1119071243ff..22dde7224063c 100644
--- a/Localization/pt/OrchardCore.ContentPreview.po
+++ b/Localization/pt/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "O padrão não contém uma expressão de Liquid válida. Detalhes: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Pré-visualizar"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Pré-visualização desligada"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Erro de Pré-visualização"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt/OrchardCore.ContentTypes.po b/Localization/pt/OrchardCore.ContentTypes.po
index 67964dfec4163..37b82c9c473d4 100644
--- a/Localization/pt/OrchardCore.ContentTypes.po
+++ b/Localization/pt/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Partes de conteúdo"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "O Nome não pode ser vazio."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Já existe um tipo com o mesmo Nome."
@@ -66,10 +66,10 @@ msgstr "Já existe um tipo com o mesmo Nome."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "O tipo de conteúdo \"{0}\" foi criado."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Configurações de \"{0}\" foram gravadas."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" foi removido."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Já existe uma parte com o mesmo Nome."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Já existe um campo com o mesmo Nome."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "O campo \"{0}\" foi adicionado."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Nome alterado para {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "As definições do campo \"{0}\" foram gravadas."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "O campo \"{0}\" foi removido."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "As definições da parte \"{0}\" foram gravadas."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "O nome do Tipo de Conteúdo não pode estar vazio."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Adicionar novo campo para\"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nome do campo que será exibido."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Adicionar Parte Nomeada a \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "O nome da parte reutilizável que será exibido."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Nome da parte que será apresentado. Deixe em branco para usar a predefinição."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nome do tipo que será exibido."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Novo Tipo de Conteúdo"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Nome do tipo que será exibido."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Criar"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Editar Tipo de Conteúdo - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Campos"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Editar"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Remover"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Adicionar Campo"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Guardar"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Apagar"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" configurações para \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Nome do campo que será exibido."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Que tipo de editor deve ser usado?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Que tipo de modo de exibição deve ser usado?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Guardar"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Nome da parte que será exibido."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Que tipo de editor deve ser usado?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Que tipo de modo de exibição deve ser usado?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Guardar"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Cancelar"
diff --git a/Localization/pt/OrchardCore.Contents.po b/Localization/pt/OrchardCore.Contents.po
index 8d86830ffcb2e..0e4fe8bb49dc0 100644
--- a/Localization/pt/OrchardCore.Contents.po
+++ b/Localization/pt/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} foi despublicado."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Todos os tipos de conteúdo"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Conteúdo"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Concluído"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Data em que o conteúdo foi criado ou publicado pela primeira vez."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "e continuar"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Ações"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Conteúdo"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Mostrar todos os Tipos de Conteúdo"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Escolha um icon"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Mostrar todos os Tipos de Conteúdo"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Limitar a quantidade de conteúdos provenientes desta fonte. Nota: Apenas um tipo de conteúdo é selecionável quando esta opção estiver selecionada."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Todos"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Qualquer tipo de conteúdo"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Conteúdo Criado"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Marque se quer que o conteúdo seja publicado ao criar. Se não marcar, será criada uma versão rascunho."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Apagar conteúdo usando a expressão: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Conteúdo"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Novo"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publicar conteúdo usando a expressão: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Devolver conteúdo usando a expressão: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Despublicar conteúdo usando a expressão: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/pt/OrchardCore.CustomSettings.po b/Localization/pt/OrchardCore.CustomSettings.po
index 27cd135cdba82..30e23bf4629f9 100644
--- a/Localization/pt/OrchardCore.CustomSettings.po
+++ b/Localization/pt/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Configuracões Personalizadas"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tudo"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/pt/OrchardCore.Data.YesSql.po b/Localization/pt/OrchardCore.Data.YesSql.po
index 2591142b1017f..ec71c7e7573e7 100644
--- a/Localization/pt/OrchardCore.Data.YesSql.po
+++ b/Localization/pt/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Demo.po b/Localization/pt/OrchardCore.Demo.po
index 095462d128992..e381ba0a7ccd6 100644
--- a/Localization/pt/OrchardCore.Demo.po
+++ b/Localization/pt/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/pt/OrchardCore.Deployment.Remote.po b/Localization/pt/OrchardCore.Deployment.Remote.po
index 4e59500087530..1fcadf1914c24 100644
--- a/Localization/pt/OrchardCore.Deployment.Remote.po
+++ b/Localization/pt/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/pt/OrchardCore.Deployment.po b/Localization/pt/OrchardCore.Deployment.po
index 7f1aa9c63907d..d65aa33255d08 100644
--- a/Localization/pt/OrchardCore.Deployment.po
+++ b/Localization/pt/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/pt/OrchardCore.Diagnostics.po b/Localization/pt/OrchardCore.Diagnostics.po
index 70f756ed3bb03..78ed69ccac383 100644
--- a/Localization/pt/OrchardCore.Diagnostics.po
+++ b/Localization/pt/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "O seu browser enviou um pedido que o servidor não conseguiu interpretar."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Ocorreu um erro ao executar o pedido."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Não tem acesso a este recurso."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "A página não foi encontrada."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Não tem autorização para visualizar esta página."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/pt/OrchardCore.Email.Abstractions.po b/Localization/pt/OrchardCore.Email.Abstractions.po
index 49cfbe1f32c1c..d2b0610d4bf8a 100644
--- a/Localization/pt/OrchardCore.Email.Abstractions.po
+++ b/Localization/pt/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "O campo {0} é obrigatório."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "O método de entrega '{0}' não é suportado."
diff --git a/Localization/pt/OrchardCore.Email.po b/Localization/pt/OrchardCore.Email.po
index 80eae99f11c5d..c70cfadc35243 100644
--- a/Localization/pt/OrchardCore.Email.po
+++ b/Localization/pt/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Falhou"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Configurações"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Para"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "O remetente é opcional, é útil quando o autor do email é diferente do remetente do email."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "O tenant atual será recarregado quando as configurações forem gravadas."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "O endereço de e-mail padrão para usar como remetente, a menos que o remetente de e-mail esteja definido."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Opções de envio de e-mails"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "O domínio do servidor SMTP, por exemplo <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "O nome de utilizador para autenticação."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Opções de entrega da diretoria de recolha especificada"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/pt/OrchardCore.Facebook.po b/Localization/pt/OrchardCore.Facebook.po
index 57ef78ea5d005..0744bfcbe3d9c 100644
--- a/Localization/pt/OrchardCore.Facebook.po
+++ b/Localization/pt/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/pt/OrchardCore.Features.po b/Localization/pt/OrchardCore.Features.po
index c262e114409e1..70170854a230d 100644
--- a/Localization/pt/OrchardCore.Features.po
+++ b/Localization/pt/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funcionalidades"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Por favor, selecione uma ou mais funcionalidades."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "Ações em Massa"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Desativar"
@@ -136,8 +136,8 @@ msgstr "Desativar"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Ativar"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Sem Categoria"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Desativar a funcionalidade {0} também desativará as seguintes funcionalidades dependentes:{1}Continuar?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Desativar funcionalidade"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Sim"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Não"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Sem resultados!</strong> Sua pesquisa não retornou resultados."
diff --git a/Localization/pt/OrchardCore.Flows.po b/Localization/pt/OrchardCore.Flows.po
index 50cb4ca83ede7..5d913dde02cf7 100644
--- a/Localization/pt/OrchardCore.Flows.po
+++ b/Localization/pt/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/pt/OrchardCore.Forms.po b/Localization/pt/OrchardCore.Forms.po
index af0f93ed1a4ba..3bd15a9736702 100644
--- a/Localization/pt/OrchardCore.Forms.po
+++ b/Localization/pt/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/pt/OrchardCore.GitHub.po b/Localization/pt/OrchardCore.GitHub.po
index 978b9ce954c19..cb425ea144d59 100644
--- a/Localization/pt/OrchardCore.GitHub.po
+++ b/Localization/pt/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/pt/OrchardCore.Google.po b/Localization/pt/OrchardCore.Google.po
index 5f749218534d5..daa90812606ad 100644
--- a/Localization/pt/OrchardCore.Google.po
+++ b/Localization/pt/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/pt/OrchardCore.Html.po b/Localization/pt/OrchardCore.Html.po
index 88710629c3753..d2bd948871383 100644
--- a/Localization/pt/OrchardCore.Html.po
+++ b/Localization/pt/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Https.po b/Localization/pt/OrchardCore.Https.po
index 31939fb4a7110..6a159b072731a 100644
--- a/Localization/pt/OrchardCore.Https.po
+++ b/Localization/pt/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/pt/OrchardCore.Infrastructure.Abstractions.po b/Localization/pt/OrchardCore.Infrastructure.Abstractions.po
index 34f9eb8221b77..6a970a35dc90f 100644
--- a/Localization/pt/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/pt/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/pt/OrchardCore.Layers.po b/Localization/pt/OrchardCore.Layers.po
index 3f1c31aa11226..005c8ede10774 100644
--- a/Localization/pt/OrchardCore.Layers.po
+++ b/Localization/pt/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/pt/OrchardCore.Liquid.po b/Localization/pt/OrchardCore.Liquid.po
index a23b8816fedf7..1c284c76f8b26 100644
--- a/Localization/pt/OrchardCore.Liquid.po
+++ b/Localization/pt/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/pt/OrchardCore.Lists.po b/Localization/pt/OrchardCore.Lists.po
index 5502e8a5e70b3..7f85b310e93ea 100644
--- a/Localization/pt/OrchardCore.Lists.po
+++ b/Localization/pt/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/pt/OrchardCore.Localization.po b/Localization/pt/OrchardCore.Localization.po
index 620be72b8db97..a8bef7813100e 100644
--- a/Localization/pt/OrchardCore.Localization.po
+++ b/Localization/pt/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/pt/OrchardCore.Markdown.po b/Localization/pt/OrchardCore.Markdown.po
index a815554ed977f..b244bbdd4c1e8 100644
--- a/Localization/pt/OrchardCore.Markdown.po
+++ b/Localization/pt/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pt/OrchardCore.Media.po b/Localization/pt/OrchardCore.Media.po
index 7df8d829ffd63..bd7c84a67cf81 100644
--- a/Localization/pt/OrchardCore.Media.po
+++ b/Localization/pt/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pt/OrchardCore.Menu.po b/Localization/pt/OrchardCore.Menu.po
index 3ba9bbb97c61a..1d84b9d110264 100644
--- a/Localization/pt/OrchardCore.Menu.po
+++ b/Localization/pt/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/pt/OrchardCore.Microsoft.Authentication.po b/Localization/pt/OrchardCore.Microsoft.Authentication.po
index c829712e976ea..58809f932c35a 100644
--- a/Localization/pt/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/pt/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/pt/OrchardCore.Navigation.po b/Localization/pt/OrchardCore.Navigation.po
index 2d9f2df59a8e2..5d126e4ccb2aa 100644
--- a/Localization/pt/OrchardCore.Navigation.po
+++ b/Localization/pt/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Notifications.po b/Localization/pt/OrchardCore.Notifications.po
index d1734e2064d96..b9ad2014a3930 100644
--- a/Localization/pt/OrchardCore.Notifications.po
+++ b/Localization/pt/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/pt/OrchardCore.OpenId.po b/Localization/pt/OrchardCore.OpenId.po
index 215e067c450ed..bfbf1fe54e9f1 100644
--- a/Localization/pt/OrchardCore.OpenId.po
+++ b/Localization/pt/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/pt/OrchardCore.Placements.po b/Localization/pt/OrchardCore.Placements.po
index 307455e4fdca4..86417b10dd7d2 100644
--- a/Localization/pt/OrchardCore.Placements.po
+++ b/Localization/pt/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/pt/OrchardCore.ProjectTemplates.po b/Localization/pt/OrchardCore.ProjectTemplates.po
index 6790f50fdd55b..cb0bd04c06670 100644
--- a/Localization/pt/OrchardCore.ProjectTemplates.po
+++ b/Localization/pt/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:32\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Mostrar"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/pt/OrchardCore.PublishLater.po b/Localization/pt/OrchardCore.PublishLater.po
index 2dbf275f1e719..aaf7081dba296 100644
--- a/Localization/pt/OrchardCore.PublishLater.po
+++ b/Localization/pt/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/pt/OrchardCore.Queries.po b/Localization/pt/OrchardCore.Queries.po
index 0100c61a7fe17..9902efcde5ff2 100644
--- a/Localization/pt/OrchardCore.Queries.po
+++ b/Localization/pt/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/pt/OrchardCore.ReCaptcha.Core.po b/Localization/pt/OrchardCore.ReCaptcha.Core.po
index b651e66f9a0ca..b10b2dbfb354d 100644
--- a/Localization/pt/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/pt/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Falha ao validar captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Falha ao validar captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Idioma com o nome {0} não encontrado"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/pt/OrchardCore.ReCaptcha.po b/Localization/pt/OrchardCore.ReCaptcha.po
index f4f0cff09bd51..dd54cc2f71996 100644
--- a/Localization/pt/OrchardCore.ReCaptcha.po
+++ b/Localization/pt/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/pt/OrchardCore.Recipes.Core.po b/Localization/pt/OrchardCore.Recipes.Core.po
index e60b865b9fb3e..e2f1184b64750 100644
--- a/Localization/pt/OrchardCore.Recipes.Core.po
+++ b/Localization/pt/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/pt/OrchardCore.Roles.po b/Localization/pt/OrchardCore.Roles.po
index 517c51fa14696..2c4b9041cdc4b 100644
--- a/Localization/pt/OrchardCore.Roles.po
+++ b/Localization/pt/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/pt/OrchardCore.Rules.po b/Localization/pt/OrchardCore.Rules.po
index a47dc8a50715f..ca833ebd61eb5 100644
--- a/Localization/pt/OrchardCore.Rules.po
+++ b/Localization/pt/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/pt/OrchardCore.Search.Elasticsearch.po b/Localization/pt/OrchardCore.Search.Elasticsearch.po
index f58d870d8f586..d83ae1f018c74 100644
--- a/Localization/pt/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/pt/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/pt/OrchardCore.Search.Lucene.po b/Localization/pt/OrchardCore.Search.Lucene.po
index 8e2ca0041e8b9..60fc82fa5e92a 100644
--- a/Localization/pt/OrchardCore.Search.Lucene.po
+++ b/Localization/pt/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Search.po b/Localization/pt/OrchardCore.Search.po
index c837a12e63c50..674d31bb56a9e 100644
--- a/Localization/pt/OrchardCore.Search.po
+++ b/Localization/pt/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/pt/OrchardCore.Security.po b/Localization/pt/OrchardCore.Security.po
index d79947dffac86..077bed130a457 100644
--- a/Localization/pt/OrchardCore.Security.po
+++ b/Localization/pt/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/pt/OrchardCore.Seo.po b/Localization/pt/OrchardCore.Seo.po
index 462d0150f9e60..c15a0b79cc893 100644
--- a/Localization/pt/OrchardCore.Seo.po
+++ b/Localization/pt/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/pt/OrchardCore.Settings.po b/Localization/pt/OrchardCore.Settings.po
index d1073183d9144..b68cb438bae2d 100644
--- a/Localization/pt/OrchardCore.Settings.po
+++ b/Localization/pt/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/pt/OrchardCore.Setup.Core.po b/Localization/pt/OrchardCore.Setup.Core.po
index 6c251b94da117..e76c7282978e4 100644
--- a/Localization/pt/OrchardCore.Setup.Core.po
+++ b/Localization/pt/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/pt/OrchardCore.Setup.po b/Localization/pt/OrchardCore.Setup.po
index 150758d8561a7..754cb92e08732 100644
--- a/Localization/pt/OrchardCore.Setup.po
+++ b/Localization/pt/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "A palavra-chave deve ter pelo menos {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Não é possível criar um site sem receita."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Isto será o título predefinido das suas páginas."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Receitas permitem a configuração do seu site com outras opções, recursos e predefinições."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Determina o fuso horário predefinido usado ao exibir e editar datas e horários."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "A base de dados é utilizada para armazenar a configuração do site e seu conteúdo."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Pode especificar um prefixo para as tabelas se pretender utilizar a mesma base de dados para vários sites."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Mostrar/esconder string de conexão"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "O super utilizador tem todos os direitos. Deve ser utilizado apenas durante a instalação e para recuperação em caso de desastre."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Nome de utilizador"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "O e-mail é inválido."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Segurança da palavra-passe"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/pt/OrchardCore.Shortcodes.po b/Localization/pt/OrchardCore.Shortcodes.po
index 60e6791373ad4..1e372d91f18ed 100644
--- a/Localization/pt/OrchardCore.Shortcodes.po
+++ b/Localization/pt/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/pt/OrchardCore.Sitemaps.po b/Localization/pt/OrchardCore.Sitemaps.po
index 458a0944dd4f1..eded34641a240 100644
--- a/Localization/pt/OrchardCore.Sitemaps.po
+++ b/Localization/pt/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/pt/OrchardCore.Sms.po b/Localization/pt/OrchardCore.Sms.po
index 0cfcdc31cf660..b379b8a11e6a0 100644
--- a/Localization/pt/OrchardCore.Sms.po
+++ b/Localization/pt/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/pt/OrchardCore.Spatial.po b/Localization/pt/OrchardCore.Spatial.po
index 958122e8eb4f4..3dd812d5cc25b 100644
--- a/Localization/pt/OrchardCore.Spatial.po
+++ b/Localization/pt/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/pt/OrchardCore.Taxonomies.po b/Localization/pt/OrchardCore.Taxonomies.po
index 869f5e329f9d5..81a0b5d01cf53 100644
--- a/Localization/pt/OrchardCore.Taxonomies.po
+++ b/Localization/pt/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Templates.Cms.Module.po b/Localization/pt/OrchardCore.Templates.Cms.Module.po
index 50f333dc4b3cd..fb551f1ec156a 100644
--- a/Localization/pt/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/pt/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Mostrar"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/pt/OrchardCore.Templates.po b/Localization/pt/OrchardCore.Templates.po
index 1a96ceb1bf84d..d192e97be3eae 100644
--- a/Localization/pt/OrchardCore.Templates.po
+++ b/Localization/pt/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/pt/OrchardCore.Tenants.po b/Localization/pt/OrchardCore.Tenants.po
index 40506a57f1cfc..41218ae3770af 100644
--- a/Localization/pt/OrchardCore.Tenants.po
+++ b/Localization/pt/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/pt/OrchardCore.Tests.po b/Localization/pt/OrchardCore.Tests.po
index 9ec6a028b10fe..4007bdb6016ef 100644
--- a/Localization/pt/OrchardCore.Tests.po
+++ b/Localization/pt/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Themes.po b/Localization/pt/OrchardCore.Themes.po
index 9597057ab7735..73a082700e334 100644
--- a/Localization/pt/OrchardCore.Themes.po
+++ b/Localization/pt/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/pt/OrchardCore.Title.po b/Localization/pt/OrchardCore.Title.po
index 06d0d23154ed7..c659845d080f5 100644
--- a/Localization/pt/OrchardCore.Title.po
+++ b/Localization/pt/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/pt/OrchardCore.Twitter.po b/Localization/pt/OrchardCore.Twitter.po
index 18a7a6e9c38f9..446b242eb2b61 100644
--- a/Localization/pt/OrchardCore.Twitter.po
+++ b/Localization/pt/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/pt/OrchardCore.Users.Core.po b/Localization/pt/OrchardCore.Users.Core.po
index 749524334936f..ee9ce76de4971 100644
--- a/Localization/pt/OrchardCore.Users.Core.po
+++ b/Localization/pt/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/pt/OrchardCore.Users.po b/Localization/pt/OrchardCore.Users.po
index f4ec57e8ac22f..a8ff168154ba3 100644
--- a/Localization/pt/OrchardCore.Users.po
+++ b/Localization/pt/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Utilizador criado com sucesso"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "O login local está desativado."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Tentativa de login inválida."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Site não permite registo de utilizadores."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Confirmar a sua conta"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "O utilizador especificado não tem permissão para entrar."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Por favor, confirme o seu email."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Nome"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Aprovar"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Ativar"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Desativar"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Apagar"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Utilizador {0} aprovado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Utilizador {0} removido com sucesso."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Utilizador {0} desativado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Utilizador {0} ativado com sucesso."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Palavra-passe atualizada correctamente."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Configurações de login"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exporta as configurações de login."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Alterar configurações de e-mail"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exporta as configurações de mudança de E-mail."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Configurações de Registo"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exporta as configurações de registo."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exporta as configurações de redefinição de senha."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "A nova palavra-passe e a palavra-passe de confirmação não correspondem."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Utilizador"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Concluído"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Falhou"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/pt/OrchardCore.Widgets.po b/Localization/pt/OrchardCore.Widgets.po
index 5de4eda301c77..f41f38558a989 100644
--- a/Localization/pt/OrchardCore.Widgets.po
+++ b/Localization/pt/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/pt/OrchardCore.Workflows.po b/Localization/pt/OrchardCore.Workflows.po
index 989de63b59d6e..46d7bf3b71c34 100644
--- a/Localization/pt/OrchardCore.Workflows.po
+++ b/Localization/pt/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/pt/TheAdmin.po b/Localization/pt/TheAdmin.po
index 9a85d0f803131..c81ccb7d95208 100644
--- a/Localization/pt/TheAdmin.po
+++ b/Localization/pt/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/pt/TheAgencyTheme.po b/Localization/pt/TheAgencyTheme.po
index 2d9294d290997..9d9b90f7cce76 100644
--- a/Localization/pt/TheAgencyTheme.po
+++ b/Localization/pt/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "A página solicitada não foi encontrada."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/pt/TheBlogTheme.po b/Localization/pt/TheBlogTheme.po
index 40ff6fcd43250..19f0955d73170 100644
--- a/Localization/pt/TheBlogTheme.po
+++ b/Localization/pt/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-02-18 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "em {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Página não encontrada"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/pt/TheTheme.po b/Localization/pt/TheTheme.po
index d8cb5dc1b66d0..a833ab3e90fdb 100644
--- a/Localization/pt/TheTheme.po
+++ b/Localization/pt/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/ru/OrchardCore.Admin.po b/Localization/ru/OrchardCore.Admin.po
index a0a69c036145d..b5169620821d6 100644
--- a/Localization/ru/OrchardCore.Admin.po
+++ b/Localization/ru/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Администрирование"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Настройки администратора"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Экспорт настроек администратора."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Не стесняйтесь просматривать меню и открыть все его возможности."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Включить тёмную тему администратора"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Может ли темная тема администратора отображаться."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Показывать ли заголовки в верхней панели."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Администрирование"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/ru/OrchardCore.AdminDashboard.po b/Localization/ru/OrchardCore.AdminDashboard.po
index c9a8949f601b0..932898dd91ea4 100644
--- a/Localization/ru/OrchardCore.AdminDashboard.po
+++ b/Localization/ru/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/ru/OrchardCore.AdminMenu.po b/Localization/ru/OrchardCore.AdminMenu.po
index dd36036672075..14635f0dc75ba 100644
--- a/Localization/ru/OrchardCore.AdminMenu.po
+++ b/Localization/ru/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Создать меню администратора {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Имя"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Создать узел"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Редактировать меню администратора: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Имя"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Изменить узел"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Приоритет отображения этой ссылки как активной, применяется в случае конфликта с другим url. Ссылка с наибольшим значением имеет активный статус в навигации."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Порядок размещения этой ссылки в меню администратора."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Ссылка"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Текст ссылки, как он будет показан в дереве."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Ссылка. Будет показана, только если она или один из ее потомков имеет url. Будет являться относительной к корню сайта администратора"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Выбрать иконку"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Заполнитель"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Текст пункта меню, как он будет показан в дереве."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "Выбрать"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Выберите значок, который будет показан, когда этот элемент меню находится на первом уровне."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Выбрать значок"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Права"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Введите для поиска"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Выбрать"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Удалить"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Нет результатов"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Требуемые права для отображения этого пункта меню (опционально)."
diff --git a/Localization/ru/OrchardCore.Alias.po b/Localization/ru/OrchardCore.Alias.po
index 2ff0c7d4fd59d..28af963f7db6e 100644
--- a/Localization/ru/OrchardCore.Alias.po
+++ b/Localization/ru/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не содержит допустимое выражение Liquid. Подробности: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Оставьте пустым для повторного создания."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Псевдоним создан и ввод отключен"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ru/OrchardCore.ArchiveLater.po b/Localization/ru/OrchardCore.ArchiveLater.po
index 226e13682ecc6..d4267d5cf852d 100644
--- a/Localization/ru/OrchardCore.ArchiveLater.po
+++ b/Localization/ru/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ru/OrchardCore.AuditTrail.po b/Localization/ru/OrchardCore.AuditTrail.po
index 4ad6ea0080270..ee7a43251b9b5 100644
--- a/Localization/ru/OrchardCore.AuditTrail.po
+++ b/Localization/ru/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/ru/OrchardCore.Autoroute.po b/Localization/ru/OrchardCore.Autoroute.po
index 876cf62d86941..0cb37796973c3 100644
--- a/Localization/ru/OrchardCore.Autoroute.po
+++ b/Localization/ru/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Слишком длинная постоянная ссылка. Ссылка может быть до {0} символов."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Отметьте, чтобы отключить автоматический роутинг для этого элемента."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Отметьте, чтобы указать, что элемент дочернего контента будет маршрутизирован по абсолютному пути."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ru/OrchardCore.BackgroundTasks.po b/Localization/ru/OrchardCore.BackgroundTasks.po
index 850d7aabe3ea9..04c99833605fe 100644
--- a/Localization/ru/OrchardCore.BackgroundTasks.po
+++ b/Localization/ru/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/ru/OrchardCore.ContentFields.po b/Localization/ru/OrchardCore.ContentFields.po
index 17253a24045fb..0ce74323f9d52 100644
--- a/Localization/ru/OrchardCore.ContentFields.po
+++ b/Localization/ru/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:22\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Переключить"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Нет элементов контента."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Стандартный"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Не опубликовано"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Введите текст для поиска"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Выбрать"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Удалить"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Ничего не найдено"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Разрешить выбор нескольких элементов."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Показать все типы контента"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Типы содержимого для отображения. Выберите по крайней мере один."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Локализовано"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Редактор Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Используется ли url при вставке медиа (по умолчанию, шорткод вставлен)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документация по опциям"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "Ссылка"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Текст ссылки"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Обязательна ли ссылка."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Использовать url ссылки"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Текст подсказки для этой ссылки в редакторе."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Подсказка (плейсхолдер) для отображения, когда поле пустое."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Подсказка (плейсхолдер) для отображения, когда поле пустое."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Правильный url, предлагаемый при создании элемента содержимого."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Элементы отсутствуют."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Стандартный"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Не опубликовано"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Введите для поиска"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Выбрать"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Удалить"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Ничего не найдено"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Разрешить выбор нескольких элементов."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Типы контента для отображения. Выберите по крайней мере один."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Список чекбоксов"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Введите текст для поиска"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Выбрать"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Удалить"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Данные не найдены"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Изменить данные"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON представление разрешенных значений, например {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Диапазон"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Никто"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Спиннер"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Подсказка для отображения, когда поле пустое. (необязательно)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Количество знаков после запятой."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Минимальное разрешенное значение. (необязательно)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Максимальное разрешенное значение. (необязательно)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Изменить данные"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON представление допустимых значений, например. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Нет пользователей."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Стандартный"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Не включен"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Введите для поиска"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Выбрать"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Удалить"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Нет результатов"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Разрешить выбор нескольких элементов."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Разрешить отображение пользователей из всех ролей."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Обязательное"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Требуется ли значение."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Подсказка"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для этого поля в редакторе."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Ширина"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Ширина окна видео"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Высота"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Высота окна видео"
diff --git a/Localization/ru/OrchardCore.ContentLocalization.po b/Localization/ru/OrchardCore.ContentLocalization.po
index 1ed954cab57a3..5193070181424 100644
--- a/Localization/ru/OrchardCore.ContentLocalization.po
+++ b/Localization/ru/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:46\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Не удалось создать локализованную версию элемента содержимого."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/ru/OrchardCore.ContentPreview.po b/Localization/ru/OrchardCore.ContentPreview.po
index db1847a6d6ccd..7cc12f90a9e21 100644
--- a/Localization/ru/OrchardCore.ContentPreview.po
+++ b/Localization/ru/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не содержит допустимое выражение Liquid. Подробности: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Просмотр отключен"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Ошибка предпросмотра"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ru/OrchardCore.ContentTypes.po b/Localization/ru/OrchardCore.ContentTypes.po
index a46e620be0715..939667e33dbe5 100644
--- a/Localization/ru/OrchardCore.ContentTypes.po
+++ b/Localization/ru/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Части контента"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Отображаемое имя не может быть пустым."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Тип с таким же именем отображения уже существует."
@@ -66,10 +66,10 @@ msgstr "Тип с таким же именем отображения уже с
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Техническое имя не может быть пустым."
@@ -78,10 +78,10 @@ msgstr "Техническое имя не может быть пустым."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Техническое имя должно начинаться с буквы."
@@ -90,10 +90,10 @@ msgstr "Техническое имя должно начинаться с бу
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Техническое имя содержит недопустимые символы."
@@ -101,133 +101,133 @@ msgstr "Техническое имя содержит недопустимые
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Тип с тем же техническим именем уже существует."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Был создан тип контента \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Настройки \"{0}\" были сохранены."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" был удален."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Часть \"{0}\" добавлена."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Часть с тем же отображаемым именем уже существует."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Часть с таким техническим именем уже существует."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Часть \"{0}\" была удалена."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Часть содержимого не может быть создана."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Была создана часть содержимого \"{0}\"."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Настройки \"{0}\" были сохранены."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Поле с таким же именем отображения уже существует."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Поле с таким техническим именем уже существует."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Поле \"{0}\" добавлено."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Отображаемое имя изменено на {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Настройки поля \"{0}\" были сохранены."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Поле \"{0}\" было удалено."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Настройки части \"{0}\" были сохранены."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Название типа содержимого не может быть пустым."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Невозможно добавить часть с именем '{0}'. Она уже существует."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Добавить новое поле в \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Название поля, как оно будет отображаться на экранах."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Добавить именную часть в \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Название переиспользуемой части, как оно будет отображаться на экранах."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Техническое название части."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Экспортирует указанный тип содержимого и определения частей для обновления."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Имя части, как она будет отображаться на экранах. Оставьте пустым, чтобы использовать по умолчанию."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Отметьте, чтобы разрешить эту часть присоединить несколько раз."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Название типа, как оно будет отображаться на экранах."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Новый тип содержимого"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Название типа, как оно будет отображаться на экранах."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Новая часть контента"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Создать"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Разделенный запятыми список определений типов контента для удаления"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Экспортирует указанный тип содержимого и определения частей для удаления."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Изменить тип контента - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Поля"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Редактировать"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Удалить"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Режим отображения"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "Редактор"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Добавить поле"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Части"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Содержит поля для текущего типа"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Добавить части"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Добавить именную часть"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Сохранить"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Удалить"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" настройки для \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Название поля, как оно будет отображаться на экранах."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Техническое название поля."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Какой тип редактора должен быть использован?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Какой тип отображения должен использоваться?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Сохранить"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Отмена"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Некоторые параметры части, общие для всех типов, также могут быть определены на уровне <a href=\"{0}\">Определение части</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Название части, как она будет отображаться на экранах."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Описание части, как она будет отображаться на экранах."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Какой тип редактора должен быть использован?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Какой режим отображения должен использоваться?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Сохранить"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Отмена"
diff --git a/Localization/ru/OrchardCore.Contents.po b/Localization/ru/OrchardCore.Contents.po
index ddaec925e893d..86069fe2eb1a8 100644
--- a/Localization/ru/OrchardCore.Contents.po
+++ b/Localization/ru/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Ваш {0} снят с публикации."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Все типы содержимого"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Контент"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Готово"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Дата создания или первого опубликования элемента содержимого."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "и продолжить"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Действия"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип контента"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип контента"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Контент"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип контента"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Черновик сохранен."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Элемент содержимого"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип содержимого"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Показать все типы контента"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Выберите иконку"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Показать все типы контента"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Ограничение количества элементов контента для предоставления из этого источника. Примечание: только один тип контента выбирается при выборе этой опции."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Частота по умолчанию, с которой эти типы контента могут изменяться."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Все"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип контента"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип содержимого"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Любой тип содержимого"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Создать контент"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Включите, если хотите, чтобы элемент содержимого был опубликован при создании. Выключите для создания черновика."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Удалить содержимое с помощью выражения: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Просмотр черновика в формате JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Скачать черновик как JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Просмотр опубликованного в формате JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Скачать опубликованное в формате JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Просмотр в формате JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Контент для экспорта в целевые планы развертывания не найден. Создайте план развертывания и добавьте к нему шаг «Экспорт содержимого в целевой объект развертывания»."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Контент"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Создать"
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Опубликовать содержимое с помощью выражения: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Получить содержимое, используя выражение: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Снять публикацию контента с помощью выражения: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Обновить содержимое, используя выражение: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Введите выражение JavaScript для вычисления ID элемента содержимого (ContentItemId), который будет обновлён. Например: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/ru/OrchardCore.CustomSettings.po b/Localization/ru/OrchardCore.CustomSettings.po
index 8110d31b09ee3..7aa4199c6f4fc 100644
--- a/Localization/ru/OrchardCore.CustomSettings.po
+++ b/Localization/ru/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Пользовательские настройки"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Всё"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/ru/OrchardCore.Data.YesSql.po b/Localization/ru/OrchardCore.Data.YesSql.po
index bd4f5264a407c..3f51bceb7ece6 100644
--- a/Localization/ru/OrchardCore.Data.YesSql.po
+++ b/Localization/ru/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/ru/OrchardCore.Demo.po b/Localization/ru/OrchardCore.Demo.po
index 937c9eca703b5..1c21cc3b5df11 100644
--- a/Localization/ru/OrchardCore.Demo.po
+++ b/Localization/ru/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Имя"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Фамилия"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/ru/OrchardCore.Deployment.Remote.po b/Localization/ru/OrchardCore.Deployment.Remote.po
index e05c6b3e32fb0..ff2cfaf15799e 100644
--- a/Localization/ru/OrchardCore.Deployment.Remote.po
+++ b/Localization/ru/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Отправляет план развертывания в удаленный экземпляр."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Имя клиента"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Создать удаленный экземпляр"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "Адрес"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Имя клиента"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Редактировать удаленный клиент"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Имя клиента"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Редактировать удаленный экземпляр"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "Адрес"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Имя клиента"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/ru/OrchardCore.Deployment.po b/Localization/ru/OrchardCore.Deployment.po
index 1f3f5cb1b2520..389c0e4f3694b 100644
--- a/Localization/ru/OrchardCore.Deployment.po
+++ b/Localization/ru/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Импорт JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Удалить"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Планы развертывания успешно удалены."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Имя является обязательным."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "План развертывания с таким именем уже существует."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "План развертывания успешно обновлен."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "План развертывания успешно удален."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Создать план развертывания"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Пользовательский файл для добавления в качестве части плана."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Имя файла, как оно будет добавлено в архив."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Планы развертывания"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Всё"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Изменить план развертывания"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Файл рецепта для добавления как часть плана."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Название рецепта."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Отображаемое имя рецепта."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Описание рецепта."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Автор рецепта."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Сайт рецепта."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Версия рецепта."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Категории рецепта (значения через запятую)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/ru/OrchardCore.Diagnostics.po b/Localization/ru/OrchardCore.Diagnostics.po
index 24ee844a94ea2..64e8199f79562 100644
--- a/Localization/ru/OrchardCore.Diagnostics.po
+++ b/Localization/ru/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Ваш браузер отправил запрос, который не может быть обработан сервером."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Произошла ошибка при выполнении этого запроса."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "У вас нет доступа к этому ресурсу."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Страница не найдена."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "У вас нет прав на просмотр этой страницы."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/ru/OrchardCore.Email.Abstractions.po b/Localization/ru/OrchardCore.Email.Abstractions.po
index 4178c59ed9f7f..a0497b8142fff 100644
--- a/Localization/ru/OrchardCore.Email.Abstractions.po
+++ b/Localization/ru/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2022-03-05 10:52\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Поле {0} является обязательным."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Метод доставки '{0}' не поддерживается."
diff --git a/Localization/ru/OrchardCore.Email.po b/Localization/ru/OrchardCore.Email.po
index 680f8742fedcc..afa3617a80992 100644
--- a/Localization/ru/OrchardCore.Email.po
+++ b/Localization/ru/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Задача электронной почты"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Сообщения"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Выполнено"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Ошибка"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Отправить письмо"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "Адрес электронной почты автора, который определяет, откуда отправляется сообщение. Оставьте пустым, чтобы использовать настроенный адрес электронной почты. С поддержкой Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Адрес электронной почты отправителя. Необходим, если он не совпадает с адресом электронной почты \"От\". С поддержкой Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Адрес электронной почты для ответа. Требуется, если вы хотите, чтобы ответ по электронной почте отправлялся на другой адрес, вместо адреса \"От\". С Liquid поддержкой."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Список адресов электронной почты получателей, разделенных запятыми. С поддержкой Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Параметры"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Кому"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Отправитель опционален, он полезен когда автор письма отличается от отправителя письма."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Cкрытая копия"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Копия"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Ответить"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Тема"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Текст сообщения"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Текущий тенант будет перезагружен, когда настройки будут сохранены."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Адрес электронной почты по умолчанию для использования в качестве отправителя, если не задан отправитель электронной почты."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Параметры доставки почты"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Домен SMTP-сервера, например. <i>smtp.mailprovider.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Порт SMTP сервера, обычно 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Если эта опция выбрана, пул приложений или идентификатор хост-процесса используется для аутентификации на почтовом сервере."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Имя пользователя для аутентификации."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Указанная директория доставик"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Например. <i>C:\\Path\\To\\Tего\\Site\\PickedUpEmail</i> для размещения писем в каталоге <i>PickedUpEmail</i> на C диске."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/ru/OrchardCore.Facebook.po b/Localization/ru/OrchardCore.Facebook.po
index 43c6d971f50f8..9ac336546f3cd 100644
--- a/Localization/ru/OrchardCore.Facebook.po
+++ b/Localization/ru/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Блок FaceBook содержит некорректное выражение Liquid. Подробности: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Блок содержит некорректное выражение Liquid. Подробности: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Настройки входа"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Путь к запросу в базовом пути приложения, где будет возвращен пользователь-агент. middleware будет обрабатывать этот запрос, когда он прибывает."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Шаблон плагина в формате Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Версия SDK Javascript"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Инициализировать на каждой странице"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/ru/OrchardCore.Features.po b/Localization/ru/OrchardCore.Features.po
index 63b50d78b8819..6bef22b92da57 100644
--- a/Localization/ru/OrchardCore.Features.po
+++ b/Localization/ru/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Возможности"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Пожалуйста, выберите одну или несколько функций."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} было {1}."
@@ -125,9 +125,9 @@ msgstr "Групповые действия"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Отключить"
@@ -136,8 +136,8 @@ msgstr "Отключить"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Включить"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Без категории"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Отключение функции {0} также отключит следующие зависимые функции:{1}Продолжить?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Отключить функцию"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Да"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Нет"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Ничего не найдено!</strong> Поиск не дал результатов."
diff --git a/Localization/ru/OrchardCore.Flows.po b/Localization/ru/OrchardCore.Flows.po
index a5a7b873c86f0..c476107e0946f 100644
--- a/Localization/ru/OrchardCore.Flows.po
+++ b/Localization/ru/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Добавить элемент"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Типы содержимого, которые может содержать этот контейнер, например, слайд для слайд-шоу."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Вставить виджет"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Удалить"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Вы уверены, что хотите удалить этот элемент?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/ru/OrchardCore.Forms.po b/Localization/ru/OrchardCore.Forms.po
index 98b0ce152abae..313bff864e897 100644
--- a/Localization/ru/OrchardCore.Forms.po
+++ b/Localization/ru/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Некорректный формат написания опций."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Задача проверки добавляемой модели"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Проверка"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Задача привязки состояния модели"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Проверка"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Задача проверки Antiforgery-токена"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Проверка"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Корректно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Некорректно"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Задача проверки поля формы"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Проверка"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Корректно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Некорректно"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Задача проверки формы"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Проверка"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Корректно"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Некорректно"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Имя поля формы, которое имеет недопустимое значение."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Привязывает отправленные поля формы к состоянию модели."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Текст для отображения на кнопке."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Тип кнопки."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "ID для отображения на этом элементе формы."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Имя для отображения на этом элементе формы."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "URL для отправки формы."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Метод HTTP для отправки формы."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Отметьте, чтобы генерировать Antiforgery-токен для формы."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Тип кнопки."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Текст для отображения, когда поле не имеет значения."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Значение по умолчанию для этого поля."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Изменить данные"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON представление допустимых значений, например. {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Текст для отображения, когда поле не имеет значения."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Проверка <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Название поля формы для проверки."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Проверяет, содержит ли представленная форма какие-либо ошибки проверки."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/ru/OrchardCore.GitHub.po b/Localization/ru/OrchardCore.GitHub.po
index 198c9ec2020dd..80774f54290ee 100644
--- a/Localization/ru/OrchardCore.GitHub.po
+++ b/Localization/ru/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Настройки аутентификации Github"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Client ID написан на главной вкладке вашего приложения <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Секрет вашего приложения."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ru/OrchardCore.Google.po b/Localization/ru/OrchardCore.Google.po
index c1f40a60422c0..32a5555360b99 100644
--- a/Localization/ru/OrchardCore.Google.po
+++ b/Localization/ru/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Настройки Google Аналитики"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Настройки Google Authentication"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Идентификатор клиента, определенный в консоли Google API для приложения."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Секрет клиента, определенный в консоли Google API для приложения."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/ru/OrchardCore.Html.po b/Localization/ru/OrchardCore.Html.po
index 6b0d06815a94d..575142ee7f50f 100644
--- a/Localization/ru/OrchardCore.Html.po
+++ b/Localization/ru/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Редактор Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Тело элемента содержимого."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Используется ли url при вставке медиа (по умолчанию, шорткод вставлен)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Введите параметры редактора"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документация по вариантам"
diff --git a/Localization/ru/OrchardCore.Https.po b/Localization/ru/OrchardCore.Https.po
index 6b3bf300f741b..9350f970c3d80 100644
--- a/Localization/ru/OrchardCore.Https.po
+++ b/Localization/ru/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Указывает, следует ли использовать постоянное перенаправление (308 Перемещено навсегда) вместо временного перенаправления (307 Найдено) при перенаправлении на HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/ru/OrchardCore.Infrastructure.Abstractions.po b/Localization/ru/OrchardCore.Infrastructure.Abstractions.po
index 21128d4f5f145..17ab5549dfe04 100644
--- a/Localization/ru/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/ru/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2022-03-05 10:52\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/ru/OrchardCore.Layers.po b/Localization/ru/OrchardCore.Layers.po
index cea6800b1d5d0..6cdfd5ec9b08d 100644
--- a/Localization/ru/OrchardCore.Layers.po
+++ b/Localization/ru/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Создать слой"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Описание"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Изменить слой - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Редактировать виджеты и слои"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Виджет успешно перемещен. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Отменить</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Зоны"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Пожалуйста, <a href=\"{0}\">определите доступные зоны</a> перед добавлением виджетов"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Добавить виджет"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Слои"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Выберите слой, чтобы показать связанные виджеты."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Смотреть документацию"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Изменить"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Удалить"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Пожалуйста, <a href=\"{0}\">создайте слой</a> перед добавлением виджетов"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Добавить"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Если отмечено, название будет отображаться с виджетом."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Слой, с которым виджет должен быть связан."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/ru/OrchardCore.Liquid.po b/Localization/ru/OrchardCore.Liquid.po
index f4a9f2ee202de..f15b8d912ecf2 100644
--- a/Localization/ru/OrchardCore.Liquid.po
+++ b/Localization/ru/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Блок Liquid содержит некорректное выражение Liquid. Подробности: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/ru/OrchardCore.Lists.po b/Localization/ru/OrchardCore.Lists.po
index 4892d43d14bba..6f9db0cb9a58a 100644
--- a/Localization/ru/OrchardCore.Lists.po
+++ b/Localization/ru/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Представляет собой ссылку на элемент родительского контента и порядок отображения элемента содержимого."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Представляет собой коллекцию элементов контента."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Указанная запись блога больше не существует. Пожалуйста, создайте новую запись блога."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "У вас нет разрешения на удаление этого контента"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Неверное имя пользователя или адрес электронной почты или пароль."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Список пуст"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Текущий канал доступен на <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Установите эту опцию, чтобы включить ручную сортировку элементов."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Списки"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Добавить элемент родительского меню"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/ru/OrchardCore.Localization.po b/Localization/ru/OrchardCore.Localization.po
index 570f7cc45311e..e50d947d56412 100644
--- a/Localization/ru/OrchardCore.Localization.po
+++ b/Localization/ru/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Культуры"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Требуется культура"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Сайт был перезапущен для вступления в силу настроек."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Активные культуры настроенные для сайта."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Настройки культуры"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Экспорт настроек культуры."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Добавить культуру"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/ru/OrchardCore.Markdown.po b/Localization/ru/OrchardCore.Markdown.po
index 5b2faaddb137c..221d5617f0f56 100644
--- a/Localization/ru/OrchardCore.Markdown.po
+++ b/Localization/ru/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} не содержит допустимое выражение Liquid. Подробности: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Редактор Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Тело элемента содержимого, в формате разметки."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Редактор Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ru/OrchardCore.Media.po b/Localization/ru/OrchardCore.Media.po
index 31da27e3163c4..8379cf97d4c05 100644
--- a/Localization/ru/OrchardCore.Media.po
+++ b/Localization/ru/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Невозможно переместить медиа, потому что файл таким именем уже существует"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Профиль с таким именем уже существует."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Медиапрофиль успешно удален."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Профили медиа успешно удалены."
@@ -181,95 +181,95 @@ msgstr "Профили медиа успешно удалены."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "По умолчанию"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Пользовательский размер"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "По умолчанию (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: При обработке файлов произошла ошибка."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Получать ли ресурсы только корневого каталога или из всех подкаталогов."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Создать медиа профиль"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Имя медиа профиля."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Подсказка для медиа профиля."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Выберите ширину для обработанного изображения. Значение по умолчанию означает, что ширина не будет применяться."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Выберите высоту для обработанного изображения. Значение по умолчанию означает, что высота не будет применяться."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Выберите режим изменения размера для обработанного изображения."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Выберите цвет фона для обработанного изображения. Пустое значение означает, что команда bgcolor не будет применяться. Примеры допустимых значений: 'white', 'ffff00', 'ffff0080', '128,64,32' и '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Выберите формат обработанного изображения. Значение по умолчанию означает, что формат не будет применяться."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Редактирование медиа профиля"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Имя медиа профиля."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Подсказка для медиа профиля."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Выберите ширину для обработанного изображения. Значение по умолчанию означает, что ширина не будет применяться."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Выберите высоту для обработанного изображения. Значение по умолчанию означает, что высота не будет применяться."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Выберите режим изменения размера для обработанного изображения."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Выберите цвет фона для обработанного изображения. Пустое значение означает, что команда bgcolor не будет применяться. Примеры допустимых значений: 'white', 'ffff00', 'ffff0080', '128,64,32' и '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Выберите формат обработанного изображения. Значение по умолчанию означает, что формат не будет применяться."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Инвертировать"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Создать папку"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Переименовать элемент"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Медиа"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Все"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr "Экспортирует все или указанные медиа."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Маленькие миниатюры"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Большие миниатюры"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} Кб)"
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Прикрепленный"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Маленькие миниатюры"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Большие миниатюры"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} Кб)"
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Выбрать медиа"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "ОК"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Допускается ли выбор точки привязки для изменения размера."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ru/OrchardCore.Menu.po b/Localization/ru/OrchardCore.Menu.po
index 898c87de0f67a..7196ee280660c 100644
--- a/Localization/ru/OrchardCore.Menu.po
+++ b/Localization/ru/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Элементы меню"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Пункт меню успешно удален."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Редактировать {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/ru/OrchardCore.Microsoft.Authentication.po b/Localization/ru/OrchardCore.Microsoft.Authentication.po
index 757126abf19ad..7e61315ac7c3d 100644
--- a/Localization/ru/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/ru/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Настройки аутентификации учетной записи Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "ID приложения найден на страницах портала Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Секретный ключ приложения найден на параметрах портала разработчика Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/ru/OrchardCore.Navigation.po b/Localization/ru/OrchardCore.Navigation.po
index 964b319e80db1..c409bbb2bdddf 100644
--- a/Localization/ru/OrchardCore.Navigation.po
+++ b/Localization/ru/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/ru/OrchardCore.Notifications.po b/Localization/ru/OrchardCore.Notifications.po
index da934ecc311ce..1ceb77414b508 100644
--- a/Localization/ru/OrchardCore.Notifications.po
+++ b/Localization/ru/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/ru/OrchardCore.OpenId.po b/Localization/ru/OrchardCore.OpenId.po
index 0acadfcfb9805..1e8f675319763 100644
--- a/Localization/ru/OrchardCore.OpenId.po
+++ b/Localization/ru/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Имя уже занято другой сферой."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Конфигурация сервера OpenID успешно обновлена."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Конфигурация проверки OpenID успешно обновлена."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Создать новое приложение"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Id клиента"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Конфиденциальные приложения ДОЛЖНЫ отправлять свой клиентский секрет при общении с маркером и конечными точками отзыва. Это гарантирует, что только клиент может обмениваться кодом авторизации или получить токен обновления."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Разрешить обновление токенов"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Включить конечную точку выхода"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Создать новую область"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Примечание: тенант сервера всегда включен в токен доступа, даже если не запрашивается."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Изменить приложение"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Id клиента"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Конфиденциальные приложения ДОЛЖНЫ отправлять свой клиентский секрет при общении с маркером и конечными точками отзыва. Это гарантирует, что только клиент может обмениваться кодом авторизации или получить токен обновления."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Секрет клиента"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Разрешить обновление токенов"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Изменить область"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Название"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Примечание: тенант сервера всегда включен в токен доступа, даже если не запрашивается."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Текущий тенант будет перезагружен, когда настройки будут сохранены."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Отображаемое имя IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Полномочие для использования при звонках OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Путь к запросу в базовом пути приложения, где будет возвращен пользователь-агент. middleware будет обрабатывать этот запрос, когда он прибывает."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Смотрите post_logout_redirect_uri из "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "Uri, где агент пользователя будет перенаправлен после выхода приложения из провайдера идентификации. Переадресация будет происходить после вызова SignedOutCallbackPath."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Поток аутентификации кода"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "см: "
@@ -1217,15 +1217,15 @@ msgstr "Использовать тип ответа 'code'"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "пример:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Использовать тип ответа 'code token'"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Неявный поток аутентификации"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Использовать тип ответа 'id_token'"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Использовать тип ответа 'id_token token'"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Режим ответа"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Настройка режима ответа см: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Секрет клиента"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "установить секрет клиента."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Эти опции являются опционными и предназначены только для продвинутых пользователей."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "Базовый URL сервера идентификации (этот сайт). Если ничего не указано, то значение по умолчанию, основанное на узле сайта, автоматически вычисляется."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "Выберите расположение сертификата шифрования."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "Выберите расположение сертификата шифрования."
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Вам нужно добавить сертификат на ваш сервер для настройки модуля OpenID Connect."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "Выберите расположение сертификата подписи."
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "Выберите хранилище сертификата подписи."
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "Если эта опция включена, то токены обновления не помечаются как погашенные и могут быть повторно использованы до истечения срока действия."
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Текущий тенант будет перезагружен, когда настройки будут сохранены."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Сервер авторизации"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "Адрес удаленного сервера коннектора OpenID. Настоятельно рекомендуется использовать адрес HTTPS."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/ru/OrchardCore.Placements.po b/Localization/ru/OrchardCore.Placements.po
index 5c4d5693e244c..0b8cfca7903ee 100644
--- a/Localization/ru/OrchardCore.Placements.po
+++ b/Localization/ru/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "Правила размещения для \"{0}\" уже существуют. Пожалуйста, отредактируйте существующее правило."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "Настройки размещения \"{0}\" были сохранены."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "Размещение \"{0}\" пусто."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "Размещение \"{0}\" было удалено."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "Произошла ошибка при анализе размещения<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "Произошла ошибка при сохранении размещения."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "Размещения успешно удалены."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "Редактировать размещение"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "Тип формы."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/ru/OrchardCore.ProjectTemplates.po b/Localization/ru/OrchardCore.ProjectTemplates.po
index 5edfcff3e0aa5..ae0a7bdc977ae 100644
--- a/Localization/ru/OrchardCore.ProjectTemplates.po
+++ b/Localization/ru/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Показать"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ru/OrchardCore.PublishLater.po b/Localization/ru/OrchardCore.PublishLater.po
index 27c10a9ec1ebc..a1a12674e158e 100644
--- a/Localization/ru/OrchardCore.PublishLater.po
+++ b/Localization/ru/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Опубликовать позже"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Отменить публикацию позже"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/ru/OrchardCore.Queries.po b/Localization/ru/OrchardCore.Queries.po
index 5350d5c69cb5a..be99614e9ddd6 100644
--- a/Localization/ru/OrchardCore.Queries.po
+++ b/Localization/ru/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Запустить SQL-запрос"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Ошибка выполнения sql запроса: {0}"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL-запрос"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "SQL-запрос использует стандартный синтаксис SQL92 и конвертируется на основе фактической базы данных. Таблицы будут автоматически прописаны."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Запрос"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Техническое имя запроса."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "При отмеченной опции результат должен быть списком идентификаторов документа."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/ru/OrchardCore.ReCaptcha.Core.po b/Localization/ru/OrchardCore.ReCaptcha.Core.po
index 378add49ee6fe..dcd42f94e02d1 100644
--- a/Localization/ru/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/ru/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Не удалось проверить captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Не удалось проверить captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Язык с именем {0} не найден"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/ru/OrchardCore.ReCaptcha.po b/Localization/ru/OrchardCore.ReCaptcha.po
index edd8d4f3014c2..965595beb4aa6 100644
--- a/Localization/ru/OrchardCore.ReCaptcha.po
+++ b/Localization/ru/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Экспорт настроек ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Задача проверки ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Проверка"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Корректно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Некорректно"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Ошибка проверки Captcha. Попробуйте еще раз."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Текущий тенант будет перезагружен, когда настройки будут сохранены."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Ключ сайта Google reCaptcha."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/ru/OrchardCore.Recipes.Core.po b/Localization/ru/OrchardCore.Recipes.Core.po
index 266c78b7a2f9d..185d4707edcf6 100644
--- a/Localization/ru/OrchardCore.Recipes.Core.po
+++ b/Localization/ru/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/ru/OrchardCore.Roles.po b/Localization/ru/OrchardCore.Roles.po
index 6dcb07158c1a0..29af3c6d28b5f 100644
--- a/Localization/ru/OrchardCore.Roles.po
+++ b/Localization/ru/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Роли"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Некорректное имя роли."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Роль успешно обновлена."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Не удается удалить системные роли."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Создать роль"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Имя роли"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Изменить детализацию роли"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Разрешение"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Это разрешение может позволить пользователю поднять другие разрешения. Давайте его с максимальной осторожностью."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Отмена"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Роли"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/ru/OrchardCore.Rules.po b/Localization/ru/OrchardCore.Rules.po
index 068a1d8af20bb..daa7a33901a4b 100644
--- a/Localization/ru/OrchardCore.Rules.po
+++ b/Localization/ru/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/ru/OrchardCore.Search.Elasticsearch.po b/Localization/ru/OrchardCore.Search.Elasticsearch.po
index 05811b20f29d2..20a9129fccde6 100644
--- a/Localization/ru/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/ru/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/ru/OrchardCore.Search.Lucene.po b/Localization/ru/OrchardCore.Search.Lucene.po
index e1ce99627bf60..eafa99fb776f3 100644
--- a/Localization/ru/OrchardCore.Search.Lucene.po
+++ b/Localization/ru/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/ru/OrchardCore.Search.po b/Localization/ru/OrchardCore.Search.po
index 46c1ba1895038..59133688dc7d0 100644
--- a/Localization/ru/OrchardCore.Search.po
+++ b/Localization/ru/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/ru/OrchardCore.Security.po b/Localization/ru/OrchardCore.Security.po
index efb143312b605..22eec359c70fc 100644
--- a/Localization/ru/OrchardCore.Security.po
+++ b/Localization/ru/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2022-06-01 18:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/ru/OrchardCore.Seo.po b/Localization/ru/OrchardCore.Seo.po
index 8e27d093983e9..50f56af1747b9 100644
--- a/Localization/ru/OrchardCore.Seo.po
+++ b/Localization/ru/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/ru/OrchardCore.Settings.po b/Localization/ru/OrchardCore.Settings.po
index 170721cdabe55..9428d3227c196 100644
--- a/Localization/ru/OrchardCore.Settings.po
+++ b/Localization/ru/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Настройки сайта успешно обновлены."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Базовый URL-адрес должен быть полностью квалифицированным адресом."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Настройки сайта"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/ru/OrchardCore.Setup.Core.po b/Localization/ru/OrchardCore.Setup.Core.po
index 8bb15a2271390..9e8fc98642160 100644
--- a/Localization/ru/OrchardCore.Setup.Core.po
+++ b/Localization/ru/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/ru/OrchardCore.Setup.po b/Localization/ru/OrchardCore.Setup.po
index 87c45a1f7bb32..fd012772e1b69 100644
--- a/Localization/ru/OrchardCore.Setup.po
+++ b/Localization/ru/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Пароль должен содержать как минимум {0} символов."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Невозможно настроить сайт без рецепта."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Это используется как заголовок по умолчанию для ваших страниц."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Рецепты позволяют вам настроить ваш сайт с дополнительными заранее настроенными опциями, функциями и настройками из коробки."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Определяет часовой пояс по умолчанию, используемый при отображении и редактировании дат и времени."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "База данных используется для хранения конфигурации сайта и его содержимого."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Вы можете указать префикс таблицы, если вы намереваетесь повторно использовать одну и ту же базу данных для нескольких сайтов."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Показать/скрыть строку подключения"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Супер пользователь имеет все права. Его следует использовать только во время установки и для аварийного восстановления."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Имя пользователя"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Неправильный адрес электронной почты."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Надежность пароля"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/ru/OrchardCore.Shortcodes.po b/Localization/ru/OrchardCore.Shortcodes.po
index 03d516928e651..aaf23f7c4815f 100644
--- a/Localization/ru/OrchardCore.Shortcodes.po
+++ b/Localization/ru/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Содержимое шаблона является обязательным."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не содержит корректного выражения Liquid. Подробности: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Шаблон шорткода успешно удалён."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Шаблоны шорткода успешно удалены."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/ru/OrchardCore.Sitemaps.po b/Localization/ru/OrchardCore.Sitemaps.po
index 32d156b3e0dff..fb1c65e2f0d96 100644
--- a/Localization/ru/OrchardCore.Sitemaps.po
+++ b/Localization/ru/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Свойство сайта 'Базовый адрес' не заполнено, оно является обязательным для создания карт сайта."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Имя"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Свойство сайта 'Базовый адрес' не заполнено, оно является обязательным для создания карт сайта."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Имя"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Снимите флажок, чтобы отключить маршрутизацию к индексу карты сайта."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Свойство сайта 'Базовый адрес' не заполнено, оно является обязательным для создания карт сайта."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Имя"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Свойство сайта 'Базовый адрес' не заполнено, оно является обязательным для создания карт сайта."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Имя"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Снимите флажок, чтобы отключить маршрутизацию к индексу карты сайта."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Отметьте, чтобы исключить этот элемент из карты сайта."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Частота изменения элемента содержимого."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/ru/OrchardCore.Sms.po b/Localization/ru/OrchardCore.Sms.po
index fc58b820d1444..50ca1113664b4 100644
--- a/Localization/ru/OrchardCore.Sms.po
+++ b/Localization/ru/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/ru/OrchardCore.Spatial.po b/Localization/ru/OrchardCore.Spatial.po
index da292bd3d3e7b..9c2bf03ca802b 100644
--- a/Localization/ru/OrchardCore.Spatial.po
+++ b/Localization/ru/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/ru/OrchardCore.Taxonomies.po b/Localization/ru/OrchardCore.Taxonomies.po
index ef4a4d8cb0df8..53a1bad49a743 100644
--- a/Localization/ru/OrchardCore.Taxonomies.po
+++ b/Localization/ru/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Значение обязательно для '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Фильтры таксономии"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Теги"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Таксономия не найдена. Пожалуйста, проверьте настройки этого поля."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Ошибка при создании тега"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Тип для поиска"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Выбрать"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Убрать"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Нажмите Enter для создания тега"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Теги не найдены"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Теги"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Таксономия не найдена. Пожалуйста, проверьте настройки этого поля."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст подсказки для отображения этого поля в редакторе."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Таксономия"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Требуется"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Выбран по крайней мере один элемент."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Уникальный"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Можно ли выбрать только один элемент."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Только листы"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Листы - это единственные элементы, которые можно выбрать."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Могут ли новые теги создаваться при их наборе. Примечание: при создании таких тегов будет установлено только свойство отображаемого текста тэга."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Тип содержимого термина"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Добавить {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Вы изменили порядок таксономии."
diff --git a/Localization/ru/OrchardCore.Templates.Cms.Module.po b/Localization/ru/OrchardCore.Templates.Cms.Module.po
index f8bc7a83e687e..019d5c7676ecd 100644
--- a/Localization/ru/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/ru/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Показать"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/ru/OrchardCore.Templates.po b/Localization/ru/OrchardCore.Templates.po
index 42d79c0e0c00b..909bc40f786b2 100644
--- a/Localization/ru/OrchardCore.Templates.po
+++ b/Localization/ru/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Шаблон \"{0}\" создан."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Шаблон успешно удален."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Шаблоны успешно удалены."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Название шаблона."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Описание шаблона."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Название шаблона."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Описание шаблона."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/ru/OrchardCore.Tenants.po b/Localization/ru/OrchardCore.Tenants.po
index 777f05537ce07..f0d4de1b8a0e4 100644
--- a/Localization/ru/OrchardCore.Tenants.po
+++ b/Localization/ru/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Арендаторы"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Все состояния"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Выполняется"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Отключено"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Не инициализировано"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Имя"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Состояние"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Отключить"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Включить"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Вы не можете отключить арендатора по умолчанию."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Арендатор '{0}' уже отключен."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Арендатор '{0}' уже включен."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Вы можете включить только отключенного арендатора."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "Имя пользователя '{0}' недопустимо, может содержать только буквы или цифры."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "Некорректный адрес электронной почты."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Арендатор не найден: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Арендатор не может быть установлен."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Провайдер базы данных не определен."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Для этого поставщика базы данных требуется строка подключения."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Требуется как 'Рецепт' так и 'Имя рецепта'."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Рецепт '{0}' не найден."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Создать арендатора"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Создать арендатора"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Выберите имя создаваемого арендатора."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Опционально) описание создаваемого арендатора."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Пример: Если хост \"orchardproject.net\", адрес сайта арендатора \"http://orchardproject.net/\". С поддержкой Liquid."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Какой тип базы данных использовать?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Префикс таблиц"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Строка подключения"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Рецепт"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Отключить арендатора"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Изменить арендатора"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Активация арендатора"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Включить арендатора."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Дизайн"
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Настройка арендатора"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Выберите имя арендатора для настройки."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Имя сайта"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Имя пользователя администратора"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Email администратора"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Пароль администратора"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Какой тип базы данных использовать?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Префикс таблиц"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Строка подключения"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/ru/OrchardCore.Tests.po b/Localization/ru/OrchardCore.Tests.po
index 6fcb7dafb066c..33bd7a6480479 100644
--- a/Localization/ru/OrchardCore.Tests.po
+++ b/Localization/ru/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/ru/OrchardCore.Themes.po b/Localization/ru/OrchardCore.Themes.po
index d0a76a35e4c90..d2306e850b33f 100644
--- a/Localization/ru/OrchardCore.Themes.po
+++ b/Localization/ru/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Экспортирует выбранную тему сайта и тему администратора."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ru/OrchardCore.Title.po b/Localization/ru/OrchardCore.Title.po
index a10fc2de57b2d..4c3c458a0cba8 100644
--- a/Localization/ru/OrchardCore.Title.po
+++ b/Localization/ru/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Требуется значение для заголовка."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не содержит правильное выражение Liquid. Подробности: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Заголовок будет сгенерирован автоматически с помощью шаблона."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Стандартный"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Отметьте, чтобы отобразить заголовок в представлениях."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/ru/OrchardCore.Twitter.po b/Localization/ru/OrchardCore.Twitter.po
index fcfb14275799b..07aa1274b3b0d 100644
--- a/Localization/ru/OrchardCore.Twitter.po
+++ b/Localization/ru/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Требуется секрет токена доступа"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Задача обновления статуса Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Социальные сети"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Ошибка"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Текущий тенант будет перезагружен, когда настройки будут сохранены."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Смотреть документацию"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Настройки интеграции Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API ключ"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Ключ API, определенный на закладке \"Ключи и токены\" приложения Twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Секретный ключ API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Секрет ключа API, определенный на закладке \"Ключи и токены\" приложения Twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Токен доступа"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Токен доступа, определенный на закладке \"Ключи и токены\" приложения Twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "Секрет токена доступа"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Секрет токена доступа, определенный на закладке \"Ключи и токены\" приложения Twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Войти с помощью настроек Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Обновить Twitter-статус"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/ru/OrchardCore.Users.Core.po b/Localization/ru/OrchardCore.Users.Core.po
index e05e8cc1f7f5e..3e0b943e1c656 100644
--- a/Localization/ru/OrchardCore.Users.Core.po
+++ b/Localization/ru/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Некорректный адрес электронной почты {0}."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Непредвиденная ошибка: '{0}'."
diff --git a/Localization/ru/OrchardCore.Users.po b/Localization/ru/OrchardCore.Users.po
index 9cdc829f2eea8..775ee87c66cdb 100644
--- a/Localization/ru/OrchardCore.Users.po
+++ b/Localization/ru/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Пользователь успешно создан"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Локальный вход отключен."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Неверная попытка входа."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Произошла ошибка во внешнем провайдере."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Сайт не разрешает регистрацию пользователя."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Подтвердить свою учетную запись"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Указанный пользователь не может войти в систему."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Вы должны подтвердить ваш адрес электронной почты."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Имя"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Утвердить"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Включить"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Отключить"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Удалить"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Пользователь {0} успешно утверждён."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Пользователь {0} успешно удален."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Пользователь {0} успешно отключен."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Пользователь {0} успешно включен."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Пользователь успешно создан."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Пользователь успешно обновлен."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Пользователь успешно удален."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Не удалось удалить пользователя."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Пароль успешно обновлен."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Настройки входа"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Экспорт настроек входа."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Изменить настройки электронной почты"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Экспорт параметров изменения электронной почты."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Настройки регистрации"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Экспорт настроек регистрации."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Настройки сброса пароля"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Экспорт настроек сброса пароля."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Новый пароль и подтверждение пароля не совпадают."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Назначить задачу роли пользователя"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Пользователь"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Неудачно"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Регистрация задачи пользователя"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Правильно"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Неверный"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Служба электронной почты недоступна"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Событие обновления пользователя"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Пользователь"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Проверить задачу пользователя"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Анонимно"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Аутентификация пройдена"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Для роли"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} для роли {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Пользователь, который назначает. С поддержкой Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Новый пароль"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Создать пользователя"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Изменить пароль"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Новый пароль"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Пожалуйста, проверьте свою электронную почту, чтобы сменить пароль."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Сменить Email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Вы успешно аутентифицировались с помощью <strong>{0}</strong>. У вас уже есть учётная запись с этим адресом электронной почты. Введите пароль вашей локальной учетной записи и нажмите кнопку регистрации, чтобы связать учетные записи и завершить вход."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Имя пользователя"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Войти"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Использовать другую службу для входа"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Войти с помощью учетной записи {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Создать новый аккаунт."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Имя пользователя"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "E-mail"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Пароль"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Вы успешно аутентифицировались с помощью <strong>{0}</strong>. Пожалуйста, заполните форму ниже и нажмите кнопку \"Регистрация\", чтобы завершить регистрацию."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Имя пользователя"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Пароль"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Отправить письмо с подтверждением"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Тема сообщения. Поддерживает Liquid-синтаксис."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "E-mail"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Новый пароль"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Пользователь отключен."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Пользователь включен."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Снимите флажок, чтобы отключить эту учетную запись."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Отмена"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,17 +3518,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Установите свойство 'UserName' рабочего процесса, если пользователь аутентифицирован"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Роли"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Результат 'Для роли' будет активирован, если пользователь имеет хотя бы одну из выбранных ролей."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/ru/OrchardCore.Widgets.po b/Localization/ru/OrchardCore.Widgets.po
index 7b0a2740acc9c..d3d8b66560d02 100644
--- a/Localization/ru/OrchardCore.Widgets.po
+++ b/Localization/ru/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Добавить виджет"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/ru/OrchardCore.Workflows.po b/Localization/ru/OrchardCore.Workflows.po
index 48698c33bac1f..b21ab86d0b779 100644
--- a/Localization/ru/OrchardCore.Workflows.po
+++ b/Localization/ru/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Задача Commit Transaction"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Задача Correlate"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Примитивы"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Задача For Each"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Исполнить цикл"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Задача Fork"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Задача For Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Исполнить цикл"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Задача If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Да"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Нет"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Задача Join"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Присоединено"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Задача Log"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Примитивы"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Готово"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Исключения"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Задача Notify"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Интерфейс"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Задача Script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Задача Set Output"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Примитивы"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Задача Set Property"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Примитивы"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Задача While Loop"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Контрольный поток"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Исполнить цикл"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Готово"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Активность успешно обновлена."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Недавно созданные"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Совсем недавно созданные"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Сбойные"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Законченные"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Удалить"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Рабочий процесс {0} был удален."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Удалить"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Рабочий процесс {0} был удален."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Рабочий процесс сохранен."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Рабочий процесс {0} удален"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Задача Http Redirect"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Событие Http Request"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Готово"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Совпадает"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Задача Http Request"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Статус Http не обработан"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Задача Http Response"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Готово"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Не авторизован для вызова '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Стартовая задача"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Редактировать"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Добавить"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Корреляция"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Назад"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Вы уверены, что хотите удалить этот экземпляр рабочего процесса?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Удалить"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Доступные события"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Доступные задачи"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Вы уверены, что вы хотите удалить это действие?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Фильтр"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Выполнять <em>{0}</em> из <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Список итерации. С поддержкой JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Нет ответвлений"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Цикл <em>{0}</em> с <em>{1}</em> до <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Значение старта. При поддержке JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Конечное значение. При поддержке JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Значение цикла Шаг. При поддержке JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Перенаправление HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "URL для перенаправления. С поддержкой Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Постоянно"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Проверьте, должно ли перенаправление быть постоянным (301). Оставьте без ограничений для временного перенаправления (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Обработка входящего HTTP запроса"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Любой, кто вызывает этот URL, будет вызывать этот рабочий процесс. Оставьте его в безопасном месте."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Проверка Antiforgery токена"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Снимите эту опцию, если запрос исходит из службы, которая вызывает этот URL как вебхук. Если этот URL запрашивается из формы, то оставьте эту опцию отмеченной, чтобы убедиться, что значения формы не были приручены."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Время жизни токенов"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Нажмите на кнопку <b>Перегенерировать</b> после изменения этого значения."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Количество дней, истекших до истечения токена. 0 для того, чтобы токен не истек"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Обработка входящего HTTP запроса"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Метод HTTP для соответствия."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Имя контроллера, которое должно совпадать."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Имя действия, которое должно совпадать."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "URL для отправки запроса. Поддерживает синтаксис Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "Метод HTTP. Например: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Тип содержимого тела запроса."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Тело, которое отправляется с POST, PUT и PATCH запросами. При поддержке Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Предоставьте дополнительные HTTP заголовки, один на строку. Например: Авторизация: Bearer 123ABC. С поддержкой Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP-ответ"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Код статуса HTTP для отправки назад. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Нажмите здесь</a> для полного списка."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Тип содержимого тела запроса."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Тело для отправки обратно. С поддержкой Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Проверка <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Сортировка"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Вы уверены, что хотите удалить этот экземпляр рабочего процесса?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Удалить"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Создан: {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Пусто!</strong> Нет остановленных рабочих потоков на данный момент."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Назад"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "выбрано"
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Отключено"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 экземпляр"
-msgstr[1] "экземпляров: {0}"
-msgstr[2] "экземпляров: {0}"
-msgstr[3] "экземпляров: {0}"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Ожидает <strong>любой</strong> входящие действия перед тем, как вступить в выполнение в один путь."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Лог"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Уровень логирования."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} уведомление"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Тип уведомления."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Скрипт"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Список доступных результатов, разделенный запятыми."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Вывод через {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Имя для вывода."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Установить свойство {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Свойство для установки. Если указанное свойство еще не существует, оно будет добавлено."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Когда <em>{0}</em> сработало"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Действия пользователя не указаны"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Введите одно или несколько имен действий, разделенных запятыми."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Цикл во время <em>{0}</em> правда"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Выполнять пока условие истино."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/ru/TheAdmin.po b/Localization/ru/TheAdmin.po
index 4d13046065107..85d11034354b3 100644
--- a/Localization/ru/TheAdmin.po
+++ b/Localization/ru/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Светлая тема"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Тёмный режим"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Посетить сайт"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Свернуть / развернуть меню"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Удалить"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Вы уверены, что хотите удалить этот элемент?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Ок"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Отмена"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/ru/TheAgencyTheme.po b/Localization/ru/TheAgencyTheme.po
index ff98f9666f29e..db2cd99c87363 100644
--- a/Localization/ru/TheAgencyTheme.po
+++ b/Localization/ru/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Нет результатов."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Запрашиваемая страница не найдена."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ru/TheBlogTheme.po b/Localization/ru/TheBlogTheme.po
index feb2eea48d19a..b1ce5e261b37a 100644
--- a/Localization/ru/TheBlogTheme.po
+++ b/Localization/ru/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "{0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Нет результатов."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Страница не найдена"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/ru/TheTheme.po b/Localization/ru/TheTheme.po
index 4dc04e7c6ed30..750b1f9492272 100644
--- a/Localization/ru/TheTheme.po
+++ b/Localization/ru/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/sk/OrchardCore.Admin.po b/Localization/sk/OrchardCore.Admin.po
index 8fc2fcbeba159..2acfa7781d04a 100644
--- a/Localization/sk/OrchardCore.Admin.po
+++ b/Localization/sk/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Správca"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Nastavenia administrácie"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Exportuje nastavenia administrácie."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Vitajte v Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Neváhajte a prezrite si menu a objavte všetky jeho možnosti."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Tmavý režim"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Použiť tmavú tému administrácie."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Či sú názvy zobrazené v hornej lište."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Administrácia"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/sk/OrchardCore.AdminDashboard.po b/Localization/sk/OrchardCore.AdminDashboard.po
index 858185b2ddf94..c7fc804dffb41 100644
--- a/Localization/sk/OrchardCore.AdminDashboard.po
+++ b/Localization/sk/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -30,7 +30,7 @@ msgstr "Naozaj chcete položku zmazať?"
 #: OrchardCore.AdminDashboard\Views\Dashboard.DeleteButton.cshtml:4
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.DeleteButton"
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
 #: OrchardCore.AdminDashboard\Views\Dashboard.DeleteButton.cshtml:4
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Nie"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Pozícia"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Šírka"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
@@ -168,7 +168,7 @@ msgstr "Spravovať Dashboard"
 #: OrchardCore.AdminDashboard\Views\Dashboard\Index.cshtml:35
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Index"
 msgid "Dashboard"
-msgstr ""
+msgstr "Panel"
 
 #. @T["Click on Manage Dashboard button to add dashboard widget."]
 #: OrchardCore.AdminDashboard\Views\Dashboard\Index.cshtml:50
@@ -192,7 +192,7 @@ msgstr "Pridať Widget"
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:41
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Manage"
 msgid "Dashboard"
-msgstr ""
+msgstr "Panel"
 
 #. @T["Dashboard successfully updated."]&nbsp;<a href="#"><strong>@T["Undo"]</strong></a>.
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:55
@@ -210,5 +210,5 @@ msgstr "Späť"
 #: OrchardCore.AdminDashboard\Views\NavigationItemText-dashboard.Id.cshtml:1
 msgctxt "OrchardCore.AdminDashboard.Views.NavigationItemText-dashboard.Id"
 msgid "Dashboard"
-msgstr ""
+msgstr "Panel"
 
diff --git a/Localization/sk/OrchardCore.AdminMenu.po b/Localization/sk/OrchardCore.AdminMenu.po
index 02bb6524d75a3..1e9be6e00c692 100644
--- a/Localization/sk/OrchardCore.AdminMenu.po
+++ b/Localization/sk/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Vytvoriť Admin Menu {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Názov"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Vytvoriť uzol"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Upraviť Admin Menu {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Názov"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Upraviť uzol"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Keď dva odkazy smerujú na rovnakú adresu URL, priorita určuje ktorý sa zobrazí ako aktívny. Odkaz s najvyššou hodnotou má v navigácii aktívny stav."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Poradie umiesnenia tohto odkazu v admin menu."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Odkaz"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Text odkazu, ako sa zobrazí v strome."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Url Adresa odkazu. Odkaz sa zobrazí, iba ak má položka alebo niektorá jej podpoložka nastavenú adresu URL. Adresa URL bude relatívna ku koreňu admin stránky"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Vyberte ikonu"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Zástupný symbol"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Text odkazu, ako sa zobrazí v strome."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "Vybrať"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Ikona, ktorá sa zobrazí ak je tento odkaz položkou menu prvej úrovne."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Vyberte ikonu"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Oprávenia"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Zadajte hľadaný výraz"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Vybrať"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Odstrániť"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Nenašiel sa žiadny výsledok"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Oprávnenia potrebné na zobrazenie tejto položky ponuky (voliteľné)."
diff --git a/Localization/sk/OrchardCore.Alias.po b/Localization/sk/OrchardCore.Alias.po
index d030bc90ad389..29b716253282d 100644
--- a/Localization/sk/OrchardCore.Alias.po
+++ b/Localization/sk/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -34,25 +34,25 @@ msgstr "Alternatívna cesta pre položku obsahu"
 #: OrchardCore.Alias\Models\AliasPartExtensions.cs:18
 msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is too long. The alias can only be up to {0} characters. \"{1}\""
-msgstr ""
+msgstr "Alias je príliš dlhý. Alias môže mať maximálne {0} znakov. \"{1}\""
 
 #. yield return new ValidationResult(S["Your alias is already in use. \"{0}\"", part.Alias], new[] { nameof(part.Alias) });
 #: OrchardCore.Alias\Models\AliasPartExtensions.cs:23
 msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
-msgstr ""
+msgstr "Alias sa už používa. \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Predloha neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. @T["The alias of the content item."]
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:16
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Pre pregenerovanie ponechajte prázdne."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Východzie"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias je generovaný a nie je možné ho upraviť"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sk/OrchardCore.Apis.GraphQL.po b/Localization/sk/OrchardCore.Apis.GraphQL.po
index 441312469b819..158eb498ca9bb 100644
--- a/Localization/sk/OrchardCore.Apis.GraphQL.po
+++ b/Localization/sk/OrchardCore.Apis.GraphQL.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:43\n"
+"PO-Revision-Date: 2023-10-04 10:28\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Apis.GraphQL\AdminMenu.cs:25
@@ -30,17 +30,17 @@ msgstr "GraphiQL"
 #: OrchardCore.Apis.GraphQL\ValidationRules\MaxNumberOfResultsValidationRule.cs:54
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.MaxNumberOfResultsValidationRule"
 msgid "'{0}' exceeds the maximum number of results for '{1}' ({2})"
-msgstr ""
+msgstr "'{0}' prekračuje maximálny počet výsledkov pre '{1}' ({2})"
 
 #. S["Authorization is required to access {0}.", operationName],
 #: OrchardCore.Apis.GraphQL\ValidationRules\RequiresPermissionValidationRule.cs:67
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.RequiresPermissionValidationRule"
 msgid "Authorization is required to access {0}."
-msgstr ""
+msgstr "Na prístup k {0} je potrebné oprávnenie."
 
 #. S["Authorization is required to access the node. {0}", nodeName],
 #: OrchardCore.Apis.GraphQL\ValidationRules\RequiresPermissionValidationRule.cs:120
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.RequiresPermissionValidationRule"
 msgid "Authorization is required to access the node. {0}"
-msgstr ""
+msgstr "Na prístup k uzlu je potrebné oprávnenie. {0}"
 
diff --git a/Localization/sk/OrchardCore.ArchiveLater.po b/Localization/sk/OrchardCore.ArchiveLater.po
index c59476591a6c2..70557af9d15d7 100644
--- a/Localization/sk/OrchardCore.ArchiveLater.po
+++ b/Localization/sk/OrchardCore.ArchiveLater.po
@@ -10,29 +10,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
-msgstr ""
+msgstr "Archivovať neskôr"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
-msgstr ""
+msgstr "Zrušiť archiváciu neskôr"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
-msgstr ""
+msgstr "Štandardné"
 
 #. <span class="hint">@T["Scheduled to be archived on {0}", (object)(await DisplayAsync(await New.DateTime(Utc: Model.ScheduledArchiveUtc)))]</span>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.SummaryAdmin.cshtml:6
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.SummaryAdmin"
 msgid "Scheduled to be archived on {0}"
-msgstr ""
+msgstr "Naplánované na archiváciu dňa {0}"
 
diff --git a/Localization/sk/OrchardCore.AuditTrail.po b/Localization/sk/OrchardCore.AuditTrail.po
index 396517d916834..c86407cdb2fbf 100644
--- a/Localization/sk/OrchardCore.AuditTrail.po
+++ b/Localization/sk/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Audit"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Všetky kategórie"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Vlastný časový rozsah"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -180,7 +180,7 @@ msgstr "Filtruje podľa kategórie auditu."
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-CorrelationId.Thumbnail.cshtml:6
 msgctxt "OrchardCore.AuditTrail.Views.Items.AuditTrailAdminFilters-CorrelationId.Thumbnail"
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
 #. <p>@T["Filters on a correlation id."]</p>
 #: OrchardCore.AuditTrail\Views\Items\AuditTrailAdminFilters-CorrelationId.Thumbnail.cshtml:8
@@ -330,7 +330,7 @@ msgstr "Predvolená"
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:60
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "may be entered with or without the term name"
-msgstr ""
+msgstr "môže byť zadaný s alebo bez názvu pojmu"
 
 #. <span class="hint">@T["Single"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:64
@@ -342,7 +342,7 @@ msgstr "Jednoduchý"
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:65
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "A single value can be entered"
-msgstr ""
+msgstr "Je možné zadať jednu hodnotu"
 
 #. <span class="hint">@T["Multiple"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:69
@@ -354,13 +354,13 @@ msgstr "Viacnásobný"
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:70
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "Logical operators and groups are supported"
-msgstr ""
+msgstr "Sú podporované logické operátory a skupiny"
 
 #. <span class="hint dashed">@T["The default operator when whitespace is found, e.g. {0}", "text:foo bar -> text:foo OR bar"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:75
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailAdminListSearch"
 msgid "The default operator when whitespace is found, e.g. {0}"
-msgstr ""
+msgstr "Predvolený operátor, keď je nájdený biely znak, napríklad {0}"
 
 #. <span class="hint dashed">@T["Combines, e.g. {0}", "text:foo AND bar"]</span>
 #: OrchardCore.AuditTrail\Views\AuditTrailAdminListSearch.cshtml:79
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Audit"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/sk/OrchardCore.Autoroute.po b/Localization/sk/OrchardCore.Autoroute.po
index 4e39ff0d72e9b..e39054db1e639 100644
--- a/Localization/sk/OrchardCore.Autoroute.po
+++ b/Localization/sk/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Váš permalink je príliš dlhý. Trvalý odkaz môže mať maximálne {0} znakov."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Zakázať autoroute pre túto položku obsahu."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Zaškrtnutím špecifikujete, že podpoložka položky obsahu bude smerovaná na absolútnou cestou."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sk/OrchardCore.BackgroundTasks.po b/Localization/sk/OrchardCore.BackgroundTasks.po
index 7a7357cf9e694..2b78b5c7244b3 100644
--- a/Localization/sk/OrchardCore.BackgroundTasks.po
+++ b/Localization/sk/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-22 07:34\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -62,7 +62,7 @@ msgstr ""
 #: OrchardCore.BackgroundTasks\Controllers\BackgroundTaskController.cs:273
 msgctxt "OrchardCore.BackgroundTasks.Controllers.BackgroundTaskController"
 msgid "The task has been disabled."
-msgstr ""
+msgstr "Úloha bola deaktivovaná."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Task Settings"])</h1></zone>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:4
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
-msgstr ""
+msgstr "Nadpis"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Neplatná hodnota uplynutia platnosti zámku na karte Pokročilé"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Ignoruje sa, ak nie je povolená žiadna funkcia distribuovaného zámku."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/sk/OrchardCore.ContentFields.po b/Localization/sk/OrchardCore.ContentFields.po
index 6f51529002025..944910dd35944 100644
--- a/Localization/sk/OrchardCore.ContentFields.po
+++ b/Localization/sk/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Prepínač"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy pre toto pole."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Žiadne položky."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Štandardné"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nepublikované"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Zadajte hľadaný výraz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Vybrať"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Odstrániť"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenašiel sa žiadny výsledok"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Určuje či môže byť vybraných viac položiek."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Zobraziť všetky typy obsahu"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Typy obsahu, ktoré budú zobrazené. Vyberte aspoň jeden."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy zobrazený pre toto pole."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Přeložené"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy zobrazený pre toto pole."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Určuje či sa má využiť Url pri vložení media. (Inak je použitý shortcode)"
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentácia možností"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Text odkazu"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Určuje či je URL povinné."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Použít URL odkazu"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Text nápovedy pre pole URL."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Text nápovedy pre toto pole."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Ukážková hodnota, ktorá sa zobrazí ak je pole URL prázdne."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Ukážková hodnota, ktorá sa zobrazí ak je pole text prázdne."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Východzia URL predvyplnená pri vytváraní položky."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Žiadne položky obsahu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Štandardné"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Nepublikované"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Zadajte hľadaný výraz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Vybrať"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Odstrániť"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Nenašiel sa žiadny výsledok"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Určuje či môže byť vybraných viac položiek."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Typy obsahu, ktoré budú zobrazené. Vyberte aspoň jeden."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Zadajte hľadaný výraz"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Vybrať"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Odstrániť"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Nenašiel sa žiadny výsledok"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Upraviť dáta"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON reprezentácia povolených hodnôt, napr. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Rozsah"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Žiadny"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Číselník"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy pre toto pole."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Ukážková hodnota, ktorá sa zobrazí ak je pole prázdne."
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Počet číslic za desatinnou čiarkou."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Minimálna povolená hodnota. (voliteľné)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Maximálna povolená hodnota. (voliteľné)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Upraviť dáta"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON reprezentácia povolených hodnôt, napr. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy pre toto pole."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Žiadni používatelia."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Štandardné"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Nepovolené"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Zadajte hľadaný výraz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Vybrať"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Odstrániť"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Nenašiel sa žiadny výsledok"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Určuje či môže byť vybraných viac položiek."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Určuje či budú zobrazení používatelia vo všetkých roliach."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy pre toto pole."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Povinné"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Určuje či je hodnota povinná."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Nápoveda"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy zobrazený pre toto pole."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Šírka"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Šírka okna s videom"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Výška"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Výška okna s videom"
diff --git a/Localization/sk/OrchardCore.ContentLocalization.po b/Localization/sk/OrchardCore.ContentLocalization.po
index 5ad0106e68bad..928696de067dc 100644
--- a/Localization/sk/OrchardCore.ContentLocalization.po
+++ b/Localization/sk/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Nepodarilo sa vytvoriť lokalizovanú verziu položky obsahu."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/sk/OrchardCore.ContentPreview.po b/Localization/sk/OrchardCore.ContentPreview.po
index b29cb6c4f6578..78cda6c7d9ad2 100644
--- a/Localization/sk/OrchardCore.ContentPreview.po
+++ b/Localization/sk/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Predloha neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Náhľad"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Náhľad odpojený"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Chyba náhľadu"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sk/OrchardCore.ContentTypes.po b/Localization/sk/OrchardCore.ContentTypes.po
index cc9a4ff15c3e4..d28dd35c89d87 100644
--- a/Localization/sk/OrchardCore.ContentTypes.po
+++ b/Localization/sk/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Bloky obsahu"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Názov nemôže byť prázdny."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Typ s rovnakým názvom už existuje."
@@ -66,10 +66,10 @@ msgstr "Typ s rovnakým názvom už existuje."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Technický názov nemôže byť prázdny."
@@ -78,10 +78,10 @@ msgstr "Technický názov nemôže byť prázdny."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Technický názov musí zacínať písmenom."
@@ -90,10 +90,10 @@ msgstr "Technický názov musí zacínať písmenom."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Technický názov obsahuje neplatné znaky."
@@ -101,133 +101,133 @@ msgstr "Technický názov obsahuje neplatné znaky."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Typ s rovnakým technickým názvom už existuje."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Typ obsahu \"{0}\" bol vytvorený."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "Nastavenie \"{0}\" bolo uložené."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" bol odstránený."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "Blok \"{0}\" bol pridaný."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Blok s rovnakým názvom už existuje."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Blok s rovnakým technickým názvom už existuje."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "Blok \"{0}\" bol odstránený."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Blok sa nepodarilo vytvoriť."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "Blok \"{0}\" bol vytvorený."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Nastavenie pre \"{0}\" bolo uložené."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Pole s rovnakým názvom už existuje."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Pole s rovnakým technickým názvom už existuje."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Pole \"{0}\" bolo pridané."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Názov zmenený na {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "Nastavenie pre pole \"{0}\" bolo uložené."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "Pole \"{0}\" bolo odstránené."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "Nastavenie pre blok \"{0}\" bolo uložené."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Názov typu obsahu nemôže byť prázdny."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Nedá sa pridať blok s názvom \"{0}\". Blok s rovnakým názvom už existuje."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Pridať nové pole do \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Názov poľa, ktorý bude zobrazený pri editácii obsahu."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Pridať pomenovaný blok do \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Názov bloku, ktorý bude zobrazený pri editácii obsahu."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Technický názov opakovane použiteľného bloku."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Exportuje definície typu obsahu a blokov pre aktualizáciu."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Názov bloku, ktorý bude zobrazený pri editácii obsahu. Ponechajte prázdne ak chcete použiť predvolené nastavenie."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Zaškrtnite, ak chcete povoliť viacnásobné pripojenie bloku."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Názov typu, ako bude zobrazený na obrazovke."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Nový typ obsahu"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Názov typu, ktorý bude zobrazený pri editácii obsahu."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Nový blok"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Vytvoriť"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Čiarkami oddelený zoznam definícií typov obsahu, ktoré sa majú odstrániť"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Exportuje definície typu obsahu a blokov pre zmazanie."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Upraviť typ obsahu - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Polia"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Upraviť"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Odstrániť"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Režim zobrazenia"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Pridať pole"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Bloky"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Obsahuje polia pre tento typ obsahu"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Pridať bloky"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Pridať pomenovaný blok"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Uložiť"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Zmazať"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "Nastavenie \"{0}\" pre \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Názov poľa, ktorý bude zobrazený pri editácii obsahu."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Technický názov poľa."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Aký typ editoru sa má použiť?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Aký typ zobrazenia sa má použiť?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Uložiť"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Niektoré nastavenia, ktoré sú spoločné pre všetky typy je možné definovať aj na úrovni <a href=\"{0}\">definície bloku</a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Názov bloku, ktorý bude zobrazený pri editácii obsahu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Popis bloku, ktorý bude zobrazený pri editácii obsahu."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Aký typ editoru sa má použiť?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Aký typ zobrazenia sa má použiť?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Uložiť"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Zrušiť"
diff --git a/Localization/sk/OrchardCore.Contents.po b/Localization/sk/OrchardCore.Contents.po
index 670a616ebaa40..519f782922f91 100644
--- a/Localization/sk/OrchardCore.Contents.po
+++ b/Localization/sk/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Položka {0} bola odpublikovaná."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Všetky typy obsahu"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Obsah"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Hotovo"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Audit"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Datum, vytvorenia alebo prvej publikácie položky obsahu."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "a pokračovať"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Akcie"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Obsah"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Koncept je uložený."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Položka obsahu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Zobraziť všetky typy obsahu"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Vyberte ikonu"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Zobraziť všetky typy obsahu"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Obmedzí množstvo položiek obsahu, ktoré budú poskytnuté z tohto zdroja. Poznámka: Keď je vybratá táto možnosť, je možné zvoliť iba jeden typ obsahu."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Predvolená frekvencia, s akou sa tieto typy obsahu pravdepodobne menia."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Všetko"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Akýkoľvek typ obsahu"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Vytvoriť obsah"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Zaškrtnite ak chcete položku pri vytvorení publikovať. Ponechajte odškrtnuté pre vytvorenie konceptu."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Zmazať obsah špecifikovaný pomocou výrazu: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Pozrieť koncept ako JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Stiahnuť koncept ako JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Pozriet publikované ako JSON"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Stiahnuť publikované ako JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Pozrieť ako JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Nenašiel sa žiaden cieľ exportu. Vytvorte plán nasadenia a pridajte krok Export obsahu do cieľa nasadenia."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Obsah"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Nový"
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publikovať obsah špecifikovaný pomocou výrazu: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Načítať obsah špecifikovaný pomocou výrazu: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Odpublikovať obsah špecifikovaný pomocou výrazu: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Upraviť obsah špecifikovaný pomocou výrazu: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Zadajte výraz v jazyku JavaScript, ktorý sa vyhodnotí na základe ID položky obsahu (ContentItemId), ktorá sa má aktualizovať. Napríklad: correlationId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/sk/OrchardCore.CustomSettings.po b/Localization/sk/OrchardCore.CustomSettings.po
index b3fb692ba61ec..cf566dc32bbe4 100644
--- a/Localization/sk/OrchardCore.CustomSettings.po
+++ b/Localization/sk/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Vlastné nastavenia"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Všetko"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/sk/OrchardCore.Data.YesSql.po b/Localization/sk/OrchardCore.Data.YesSql.po
index 8c34ae63ea851..8d44bb2a08f31 100644
--- a/Localization/sk/OrchardCore.Data.YesSql.po
+++ b/Localization/sk/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/sk/OrchardCore.Demo.po b/Localization/sk/OrchardCore.Demo.po
index 95267f949f2a8..f55d070c68a7f 100644
--- a/Localization/sk/OrchardCore.Demo.po
+++ b/Localization/sk/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Meno"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/sk/OrchardCore.Deployment.Remote.po b/Localization/sk/OrchardCore.Deployment.Remote.po
index 34b8dfb439464..e705a7005f617 100644
--- a/Localization/sk/OrchardCore.Deployment.Remote.po
+++ b/Localization/sk/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Odošle plán nasadenia do vzdialenej inštancie."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Názov klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Vytvoriť vzdialenú inštanciu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Názov klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Upraviť vzdialeného klienta "
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Názov klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Upraviť vzdialenú inštanciu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Názov klienta"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/sk/OrchardCore.Deployment.po b/Localization/sk/OrchardCore.Deployment.po
index 6f4e101651f23..e74e039647bdb 100644
--- a/Localization/sk/OrchardCore.Deployment.po
+++ b/Localization/sk/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Plán nasadenia bol zmazaný."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Názov je povinný."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Plán nasadenia s rovnakým názvom už existuje."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Plán nasadenia bol upravený."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Plán nasadenia bol zmazaný."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Vytvoriť plán nasadenia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Súbor ktorý chcete pridať ako súčasť plánu."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Názov súboru s ktorým bude pridaný do archívu."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Plány nasadenia"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Všetko"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Upraviť plán nasadenia"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Súbor receptu ktorý chcete pridať ako súčasť plánu."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Názov receptu."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Zobrazovaný názov receptu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Popis receptu."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Autor receptu."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Webová stránka receptu."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Verzia receptu."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Kategórie receptu (čiarkami oddelený zoznam)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/sk/OrchardCore.Diagnostics.po b/Localization/sk/OrchardCore.Diagnostics.po
index da46654865a60..0defc4bf08da1 100644
--- a/Localization/sk/OrchardCore.Diagnostics.po
+++ b/Localization/sk/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Server nebol schopný spracovať požiadavku zaslanú klientom."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Pri spracovaní požiadavky sa vyskytla chyba."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Nemáte prístup k požadovaným dátam."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Stránka nebola nájdená."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Na prístup k tomuto obsahu nemáte oprávnenie."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/sk/OrchardCore.Email.Abstractions.po b/Localization/sk/OrchardCore.Email.Abstractions.po
index e8006cff47c06..b0b2839d26868 100644
--- a/Localization/sk/OrchardCore.Email.Abstractions.po
+++ b/Localization/sk/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2022-03-05 10:52\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Pole {0} je povinné."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Spôsob doručenia „{0}“ nie je podporovaný."
diff --git a/Localization/sk/OrchardCore.Email.po b/Localization/sk/OrchardCore.Email.po
index 28d1832f63e73..1c409c49b680f 100644
--- a/Localization/sk/OrchardCore.Email.po
+++ b/Localization/sk/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Email Task"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Zasielanie správ"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Zlyhalo"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Odoslať email"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "E-mailová adresa autora, ktorá určuje, od koho je e-mail. Ak chcete použiť nakonfigurovanú e-mailovú adresu, nechajte pole prázdne. Podporuje Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "E-mailová adresa odosielateľa. Povinné, ak nie je rovnaké ako e-mailová adresa „Od“. Podporuje Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Vyžadované, ak chcete, aby sa e-mailové odpovede posielali na inú adresu ako na adresu „Od“. Podporuje Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Zoznam e-mailových adries príjemcov oddelených čiarkami. Podporuje Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Telo e-mailovej správy bude odoslané ako HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Nastavenia"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Komu"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Odosielateľ je voliteľný. Užitočné ak je autor e-mailu iný ako odosielateľ e-mailu."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Skrytá kópia"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Odpovedať"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Predmet"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Telo správy"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Aktuálny tenant sa po uložení nastavení znova načíta."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Predvolená adresa odosielateľa."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Možnosti Network delivery"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Doména servera SMTP, napr. <i> smtp.mailprovider.com </i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Port servera SMTP, zvyčajne 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Ak je vybratá táto možnosť, na autentifikáciu sa použije identita aplikačného poolu alebo host procesu."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Používateľské meno pre autentifikáciu."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Možnosti doručenia adresára vyzdvihnutia"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Napr. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> pre umiestnenie emailov do adresára <i>PickedUpEmail</i> na disku C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/sk/OrchardCore.Facebook.po b/Localization/sk/OrchardCore.Facebook.po
index 07ef12c7adea0..ac1611147a24a 100644
--- a/Localization/sk/OrchardCore.Facebook.po
+++ b/Localization/sk/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Telo FaceBook neobsahuje platný Liquid výraz. Detaily: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Telo neobsahuje platný Liquid výraz. Detaily: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Nastavenia prihlasovania"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Cesta v rámci aplikácie, kam bude vrátený user-agent. Middleware túto požiadavku spracuje."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Predvolená šablóna pluginu v Liquid formáte."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Verzia Javascript SDK"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Inicializovať na každej stránke"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/sk/OrchardCore.Features.po b/Localization/sk/OrchardCore.Features.po
index 7df667c6431aa..7fe685f776a5e 100644
--- a/Localization/sk/OrchardCore.Features.po
+++ b/Localization/sk/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funkcie"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Prosím vyberte jednu alebo viac funkcií."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} stav: {1}."
@@ -125,9 +125,9 @@ msgstr "Hromadné akcie"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Deaktivovať"
@@ -136,8 +136,8 @@ msgstr "Deaktivovať"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Aktivovať"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Nekategorizované"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Deaktivácia funkcie {0} spôsobí deaktiváciu nasledovných závislých funkcií:{1} Pokračovať?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Deaktivovať funkciu"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Áno"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Nie"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Nič tu nie je!</strong> Hľadanie nevrátilo žiadne výsledky."
diff --git a/Localization/sk/OrchardCore.Flows.po b/Localization/sk/OrchardCore.Flows.po
index 0e1fa3159241c..14ecf6ec5ba59 100644
--- a/Localization/sk/OrchardCore.Flows.po
+++ b/Localization/sk/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Pridať položku"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Typy obsahu ktoré môže obsahovať tento Bag."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Vložiť Widget"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Naozaj chcete odstrániť túto položku?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/sk/OrchardCore.Forms.po b/Localization/sk/OrchardCore.Forms.po
index c0e6227673ddf..fe081f1e0762a 100644
--- a/Localization/sk/OrchardCore.Forms.po
+++ b/Localization/sk/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Možnosti sú v nesprávnom formáte."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Pridať validačnú chybu formulára"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Validácia"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Naviazať úlohu pre stav modelu"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Validácia"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Úloha pre overenie \"Antiforgery Token\""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Validácia"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Validné"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Nevalidné"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Úloha pre overenie polí formulára"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Validácia"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Validné"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Nevalidné"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Úloha pre overenie formulára"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Validácia"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Validné"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Nevalidné"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Názov poľa formulára ktoré má nevalidnú hodnotu."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Naviazať potvrdené polia formulára na stav modelu."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Text zobrazený v tlačidle."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Typ tlačidla."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "ID pre vykreslenie na tomto fomulárovom prvku."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Meno pre vykreslenie na tomto formulárovom prvku."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "URL na ktorú má byť zaslaný formulár."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "HTTP metóda ktorá bude použitá na odoslanie formulára."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Vyberte ak má byť generovaný Anti Forgery Token."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Typ tlačidla."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Text ktorý sa zobrazí ak pole neobsahuje žiadnu hodnotu."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Predvolená hodnota pre toto pole."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Upraviť dáta"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "JSON reprezentácia povolených hodnôt, napr. {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Text ktorý sa zobrazí ak pole neobsahuje žiadnu hodnotu."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Validovať <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Názov poľa, ktoré má byť validované."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Skontroluje, či potvrdený formulár obsahuje nejaké validačné chyby."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/sk/OrchardCore.GitHub.po b/Localization/sk/OrchardCore.GitHub.po
index b89f3c8409acf..e35604a7c618c 100644
--- a/Localization/sk/OrchardCore.GitHub.po
+++ b/Localization/sk/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Nastavenia GitHub Autentifikácie"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "The Client ID definované v záložke general vašej<a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub Aplikácie</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Heslo k vašej aplikácii."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sk/OrchardCore.Google.po b/Localization/sk/OrchardCore.Google.po
index 7adc9aa4530be..0818f02b94085 100644
--- a/Localization/sk/OrchardCore.Google.po
+++ b/Localization/sk/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Nastavenia Google analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Nastavenia Google Autentifikácie"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Id klienta definované v Google API konzole."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Client secret definovaný v Google API konzole."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/sk/OrchardCore.Html.po b/Localization/sk/OrchardCore.Html.po
index e669e8892077a..b89921f2c5d32 100644
--- a/Localization/sk/OrchardCore.Html.po
+++ b/Localization/sk/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Editor Wysiwyg"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Telo položky obsahu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Štandard"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Určuje či sa má využiť Url pri vložení media. (Inak je použitý shortcode)"
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Zadajte možnosti editoru"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentácia možností"
diff --git a/Localization/sk/OrchardCore.Https.po b/Localization/sk/OrchardCore.Https.po
index 2ec54b0096708..fbe3bd9172dcb 100644
--- a/Localization/sk/OrchardCore.Https.po
+++ b/Localization/sk/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Určuje, či bude použité permanentné alebo dočasné presmerovanie na HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/sk/OrchardCore.Infrastructure.Abstractions.po b/Localization/sk/OrchardCore.Infrastructure.Abstractions.po
index e2f57b57c99f2..333da4b4e7ec9 100644
--- a/Localization/sk/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/sk/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2022-05-09 12:11\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "Prepínač \"{0}\" nebol nájdený"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Vlastnosť \"{0}\" existuje, ale nie je dekorovaná \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Chyba konvertovania hodnoty \"{0}\" na \"{1}\" pre prepínač \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Parametre príkazu \"{0}\" nie sú v súlade s jeho definíciou"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "Metóda \"{0}\" nepodporuje prepínač \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/sk/OrchardCore.Layers.po b/Localization/sk/OrchardCore.Layers.po
index 63c0762bb7fd2..a98cfbb1572ad 100644
--- a/Localization/sk/OrchardCore.Layers.po
+++ b/Localization/sk/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Vytvoriť vrstvu"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Popis"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Upraviť vrstvu - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Uložiť"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Upraviť widgety a vrstvy"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget bol presunutý. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Vrátiť späť</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zóny"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Najskôr vytvorte <a href=\"{0}\">vrstvu</a>"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Pridať Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Vrstvy"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Vyberte vrsvu pre zobrazenie priradených widgetov."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Viď dokumentáciu"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Upraviť"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Najskôr vytvorte <a href=\"{0}\">vrstvu</a>"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Pridať"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Vyberte ak sa má nadpis widgetu zobrazovať."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Vrstva ku ktorej má byť widget priradený."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/sk/OrchardCore.Liquid.po b/Localization/sk/OrchardCore.Liquid.po
index 1ae4d60770f97..f0a3c73da272e 100644
--- a/Localization/sk/OrchardCore.Liquid.po
+++ b/Localization/sk/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Telo Liquid neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/sk/OrchardCore.Lists.po b/Localization/sk/OrchardCore.Lists.po
index 92d511da08e47..deacf23f65635 100644
--- a/Localization/sk/OrchardCore.Lists.po
+++ b/Localization/sk/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Odkaz na nadriadenú položku obsahu a jej poradie."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Zoznam položiek obsahu."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "BlogPost už neexistuje. Prosím vytvorte nový."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Nemáte práva potrebné na zmazanie obsahu"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Nesprávne meno, e-mail alebo heslo."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Zoznam je prázdny"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Feed je dostupný tu  <a href=\"{0}\" target=\"_blank\">{0}</a>."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Zaškrtnite pre povolenie zoraďovania položiek."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Zoznamy"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Pridať nadriadenú položku menu"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/sk/OrchardCore.Localization.po b/Localization/sk/OrchardCore.Localization.po
index b08adeca86840..b8ba12bd77ab4 100644
--- a/Localization/sk/OrchardCore.Localization.po
+++ b/Localization/sk/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Jazyk"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Vyžaduje sa jazyk"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Stránka bola reštartovaná aby sa prejavili nastavenia."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Aktívne jazyky konfigurované pre stránku."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Nastavenie jazyku"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Exportuje nastavenia jazyku."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Pridať jazyk"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/sk/OrchardCore.Markdown.po b/Localization/sk/OrchardCore.Markdown.po
index 7729f0fb08c75..563bd207b4202 100644
--- a/Localization/sk/OrchardCore.Markdown.po
+++ b/Localization/sk/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Telo položky obsahu vo formáte Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Štandard"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Štandard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sk/OrchardCore.Media.po b/Localization/sk/OrchardCore.Media.po
index e6d98ff565754..bd3d2e1a3e50e 100644
--- a/Localization/sk/OrchardCore.Media.po
+++ b/Localization/sk/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Súbor nie je možné presunúť pretože v cieľovom priečinku už existuje súbor s rovnakým názvom"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Profil s rovnakým názvom už existuje."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Media profil bol zmazaný."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Profily médií boli zmazané."
@@ -181,95 +181,95 @@ msgstr "Profily médií boli zmazané."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Predvolená"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Vlastná veľkosť"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Východzia (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Maximum"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Orezať"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Natiahnúť"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Pri spracovávaní súborov sa vyskytla chyba."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Načítanie médií iba z koreňového adresára alebo aj zo všetkých podadresárov."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Vytvoriť media profil"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Názov media profilu."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Nápoveda pre media profil."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Vyberte šírku spracovaného obrázka. Predvolená hodnota znamená, že príkaz width nebude použitý. "
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Vyberte výšku spracovaného obrázka. Predvolená hodnota znamená, že príkaz height nebude použitý. "
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "Vyberte mód zmeny veľkosti spracovaného obrázku."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "Vyberte farbu pozadia pre spracovaný obrázok. Prázdna hodnota znamená, že príkaz bgcolor nebude použitý. Príklady platných hodnôt: 'white', 'ffff00', 'ffff0080', '128,64,32' a '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Vyberte formát spracovaného obrázka. Predvolená hodnota znamená, že príkaz format nebude použitý. "
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Upraviť media profil"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Názov media profilu."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Nápoveda pre media profil."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "Vyberte šírku spracovaného obrázka. Predvolená hodnota znamená, že príkaz width nebude použitý. "
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "Vyberte výšku spracovaného obrázka. Predvolená hodnota znamená, že príkaz height nebude použitý. "
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "Vyberte mód zmeny veľkosti spracovaného obrázku."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "Vyberte farbu pozadia pre spracovaný obrázok. Prázdna hodnota znamená, že príkaz bgcolor nebude použitý. Príklady platných hodnôt: 'biela', 'ffff00', 'ffff0080', '128,64,32' a '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "Vyberte formát spracovaného obrázka. Predvolená hodnota znamená, že príkaz format nebude použitý. "
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Invertovať"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Vytvoriť priečinok"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Premenovať položku"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Médiá"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Všetko"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr "Exportuje všetky alebo vybrané médiá."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Malé náhľady obrázkov"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr "Veľké náhľady obrázkov"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Priložené"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Štandard"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Malé náhľady obrázkov"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr "Veľké náhľady obrázkov"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Výber médií"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Či je povolený výber kotviaceho bodu na zmenu veľkosti. "
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sk/OrchardCore.Menu.po b/Localization/sk/OrchardCore.Menu.po
index 18a63cf088e9f..7075f274928ce 100644
--- a/Localization/sk/OrchardCore.Menu.po
+++ b/Localization/sk/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menu"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Položka menu bola zamazaná."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Upraviť {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/sk/OrchardCore.Microsoft.Authentication.po b/Localization/sk/OrchardCore.Microsoft.Authentication.po
index ae54b3aeae2bd..f612fe728323b 100644
--- a/Localization/sk/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/sk/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sk/OrchardCore.Navigation.po b/Localization/sk/OrchardCore.Navigation.po
index 51ba5f35a5f7d..140f31256ea62 100644
--- a/Localization/sk/OrchardCore.Navigation.po
+++ b/Localization/sk/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/sk/OrchardCore.Notifications.po b/Localization/sk/OrchardCore.Notifications.po
index 1e6b06c3159ba..7f9d3d88623c3 100644
--- a/Localization/sk/OrchardCore.Notifications.po
+++ b/Localization/sk/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/sk/OrchardCore.OpenId.po b/Localization/sk/OrchardCore.OpenId.po
index ab26c35ea8a52..2ebac491881c4 100644
--- a/Localization/sk/OrchardCore.OpenId.po
+++ b/Localization/sk/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/sk/OrchardCore.Placements.po b/Localization/sk/OrchardCore.Placements.po
index b50ff3842a26d..866cede67b588 100644
--- a/Localization/sk/OrchardCore.Placements.po
+++ b/Localization/sk/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/sk/OrchardCore.ProjectTemplates.po b/Localization/sk/OrchardCore.ProjectTemplates.po
index 6d05bc5bbf9f8..9a794316cda4b 100644
--- a/Localization/sk/OrchardCore.ProjectTemplates.po
+++ b/Localization/sk/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Zobraziť"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sk/OrchardCore.PublishLater.po b/Localization/sk/OrchardCore.PublishLater.po
index b7eac9df95a47..874cd7194f06a 100644
--- a/Localization/sk/OrchardCore.PublishLater.po
+++ b/Localization/sk/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publikovať neskôr"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Zrušiť publikovanie neskôr"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sk/OrchardCore.Queries.po b/Localization/sk/OrchardCore.Queries.po
index 68eea2e60c269..6eb42d1431e4d 100644
--- a/Localization/sk/OrchardCore.Queries.po
+++ b/Localization/sk/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/sk/OrchardCore.ReCaptcha.Core.po b/Localization/sk/OrchardCore.ReCaptcha.Core.po
index 67d1ffc9ecd0e..6d2cea2be2bd3 100644
--- a/Localization/sk/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/sk/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/sk/OrchardCore.ReCaptcha.po b/Localization/sk/OrchardCore.ReCaptcha.po
index 4d20e034e8410..9888c96c5d563 100644
--- a/Localization/sk/OrchardCore.ReCaptcha.po
+++ b/Localization/sk/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/sk/OrchardCore.Recipes.Core.po b/Localization/sk/OrchardCore.Recipes.Core.po
index 13440ede9b9d6..f155ae0ae0b1b 100644
--- a/Localization/sk/OrchardCore.Recipes.Core.po
+++ b/Localization/sk/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/sk/OrchardCore.Roles.po b/Localization/sk/OrchardCore.Roles.po
index e92dfaafdef91..eb8c4609fa91a 100644
--- a/Localization/sk/OrchardCore.Roles.po
+++ b/Localization/sk/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Roly"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Neplatné používateľské meno."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rola bola aktualizovaná."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Nie je možné zmazať systémové role."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Vytvoriť rolu"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Názov roly"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Upraviť detail roly"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Oprávnenie"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Toto oprávnenie umožní používateľovi udeľovať si ďalšie oprávnia. Udeľte s mimoriadnou obozretnosťou."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Zrušiť"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Roly"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/sk/OrchardCore.Rules.po b/Localization/sk/OrchardCore.Rules.po
index 1c2f7b2133bb4..595baadb85084 100644
--- a/Localization/sk/OrchardCore.Rules.po
+++ b/Localization/sk/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/sk/OrchardCore.Search.Elasticsearch.po b/Localization/sk/OrchardCore.Search.Elasticsearch.po
index e0871bc79a9ad..e1f545d7bc5c2 100644
--- a/Localization/sk/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/sk/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/sk/OrchardCore.Search.Lucene.po b/Localization/sk/OrchardCore.Search.Lucene.po
index 5cab5818b8579..aee1868bbb7cd 100644
--- a/Localization/sk/OrchardCore.Search.Lucene.po
+++ b/Localization/sk/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/sk/OrchardCore.Search.po b/Localization/sk/OrchardCore.Search.po
index 898a6aa6fd8e9..0e7b9f26acb05 100644
--- a/Localization/sk/OrchardCore.Search.po
+++ b/Localization/sk/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/sk/OrchardCore.Security.po b/Localization/sk/OrchardCore.Security.po
index dc146c6aab2b0..e9dbffc55b25b 100644
--- a/Localization/sk/OrchardCore.Security.po
+++ b/Localization/sk/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/sk/OrchardCore.Seo.po b/Localization/sk/OrchardCore.Seo.po
index 74b4c0fcf209e..4f9109146221d 100644
--- a/Localization/sk/OrchardCore.Seo.po
+++ b/Localization/sk/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/sk/OrchardCore.Settings.po b/Localization/sk/OrchardCore.Settings.po
index e4f9f8f17834a..0d73a474870b7 100644
--- a/Localization/sk/OrchardCore.Settings.po
+++ b/Localization/sk/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Nastavenia stránky boli aktualizovavné."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Adresa URL (Base URL) musí byť plne kvalifikovaná adresa URL."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Nastavenia stránky"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/sk/OrchardCore.Setup.Core.po b/Localization/sk/OrchardCore.Setup.Core.po
index 433428e287832..f9a2c522e3b3c 100644
--- a/Localization/sk/OrchardCore.Setup.Core.po
+++ b/Localization/sk/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/sk/OrchardCore.Setup.po b/Localization/sk/OrchardCore.Setup.po
index 3936d7ff385d6..7c96e8780561e 100644
--- a/Localization/sk/OrchardCore.Setup.po
+++ b/Localization/sk/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Heslo musí mať aspoň {0} znakov."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Nie je možné zriadiť web bez receptu."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Používa sa ako predvolený názov vašich stránok."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Recepty vám umožňujú vytvoriť web s predkonfigurovanými možnosťami, funkciami a nastaveniami."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Určuje predvolené časové pásmo použité pri zobrazení a úpravách."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Databáza sa používa na uloženie konfigurácie o obsahu stránky."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Zadajte prefix v prípade, že chcete použiť tú istú databázu pre viacero stránok."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Zobraziť/skryť connection string"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Superadmin má všetky práva. Mal by sa používať iba počas inštalácie a na zotavenie po havárii."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Používateľské meno"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Neplatný email."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Sila hesla"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/sk/OrchardCore.Shortcodes.po b/Localization/sk/OrchardCore.Shortcodes.po
index 0c2625f41279a..465940e7d1682 100644
--- a/Localization/sk/OrchardCore.Shortcodes.po
+++ b/Localization/sk/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Obsah šablóny je povinný."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Šablóna neobsahuje platný Liquid výraz. Detaily: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Shortkód bol zmazaný."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Shortkód bol úspešne odstránený."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/sk/OrchardCore.Sitemaps.po b/Localization/sk/OrchardCore.Sitemaps.po
index 60b4c4dff9596..6c4d6ca7346c2 100644
--- a/Localization/sk/OrchardCore.Sitemaps.po
+++ b/Localization/sk/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Nastavenie 'Base url' je prázdne. Nastavenie je potrebné pre generovanie mapy stránok."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Nastavenie 'Base url' je prázdne. Nastavenie je potrebné pre generovanie mapy stránok."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Odškrtnite pre vypnutie smerovania na túto mapu stránok."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Nastavenie 'Base url' je prázdne. Nastavenie je potrebné pre generovanie mapy stránok."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Nastavenie 'Base url' je prázdne. Nastavenie je potrebné pre generovanie mapy stránok."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Názov"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Odškrtnite pre vypnutie smerovania na tento index mapy stránok."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Zaškrtnite pre vylúčenie tejto položky obsahu z mapy stránok."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Predvolená frekvencia, s akou sa tieto typy obsahu pravdepodobne menia."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/sk/OrchardCore.Sms.po b/Localization/sk/OrchardCore.Sms.po
index 6effc69ef068f..34eeeff0ab021 100644
--- a/Localization/sk/OrchardCore.Sms.po
+++ b/Localization/sk/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/sk/OrchardCore.Spatial.po b/Localization/sk/OrchardCore.Spatial.po
index 53d0ffd400bc8..565f3dba74063 100644
--- a/Localization/sk/OrchardCore.Spatial.po
+++ b/Localization/sk/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sk/OrchardCore.Taxonomies.po b/Localization/sk/OrchardCore.Taxonomies.po
index 011c87d72438e..d14020a99c11f 100644
--- a/Localization/sk/OrchardCore.Taxonomies.po
+++ b/Localization/sk/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Hodnota pre {0} je povinná."
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Filtre taxonómie"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Tagy"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Nepodarilo sa nájsť taxonómiu. Prosím skontrolujte nastavenia pre toto pole."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Chyba pri vytváraní tagu"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Zadajte hľadaný výraz"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Vybrať"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Odstrániť"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Stlačte enter pre vytvorenie tagu"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Nenašli sa žiadne tagy"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Tagy"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Štandard"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Nepodarilo sa nájsť taxonómiu. Prosím skontrolujte nastavenia pre toto pole."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Štandard"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Text nápovedy pre toto pole."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonómia"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Povinné"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Určuje či má byť vybraná aspoň jedna položka."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unikátne"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Určuje či má byť vybraná práve jedna položka."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Iba listy"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Určuje či sa dajú vyberať iba listy."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Určuje či je možné vytvárať nové tagy priamo pri výbere. Ak sú vytvárané tagy týmto spôsobom, je vypĺňaná iba ich vlastnosť display text."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Typ obsahu Slovo"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Pridať {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Poradie bolo zmenené."
diff --git a/Localization/sk/OrchardCore.Templates.Cms.Module.po b/Localization/sk/OrchardCore.Templates.Cms.Module.po
index 1868421e3c383..abadfce6d61c4 100644
--- a/Localization/sk/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/sk/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Zobraziť"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sk/OrchardCore.Templates.po b/Localization/sk/OrchardCore.Templates.po
index 2915a81f77d41..5f57069e809ec 100644
--- a/Localization/sk/OrchardCore.Templates.po
+++ b/Localization/sk/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Šablóna \"{0}\" bola vytvorená."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Šablóna bola zmazaná."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Šablóna bola úspešne odstránená."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Náhľad"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Názov šablóny."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Popis šablóny."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Náhľad"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Názov šablóny."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Popis šablóny."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/sk/OrchardCore.Tenants.po b/Localization/sk/OrchardCore.Tenants.po
index 4b7b659c4fd73..64db6cdbac919 100644
--- a/Localization/sk/OrchardCore.Tenants.po
+++ b/Localization/sk/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Všetky stavy"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Bežiace"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Vypnuté"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Neinicializované"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Názov"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Stav (State)"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Vypnúť"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Zapnúť"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "Neplatný email."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Recept '{0}' nenájdený."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/sk/OrchardCore.Tests.po b/Localization/sk/OrchardCore.Tests.po
index d2a5df163050d..8fa645f3a0e07 100644
--- a/Localization/sk/OrchardCore.Tests.po
+++ b/Localization/sk/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/sk/OrchardCore.Themes.po b/Localization/sk/OrchardCore.Themes.po
index 3294353b0a454..f6598625f797b 100644
--- a/Localization/sk/OrchardCore.Themes.po
+++ b/Localization/sk/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exportuje zvolenú tému webu a administrácie."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sk/OrchardCore.Title.po b/Localization/sk/OrchardCore.Title.po
index 7dc8c6c3e084b..19656d48b5e9a 100644
--- a/Localization/sk/OrchardCore.Title.po
+++ b/Localization/sk/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Hodnota je pre nadpis povinná."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Predloha neobsahuje platný Liquid výraz. Detaily: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Nadpis bude vygenerovaný automaticky pomocou predlohy."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Zaškrtnite ak sa má nadpis renderovať v zobrazeniach."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sk/OrchardCore.Twitter.po b/Localization/sk/OrchardCore.Twitter.po
index 28a0599497cb3..be56efa1a7da7 100644
--- a/Localization/sk/OrchardCore.Twitter.po
+++ b/Localization/sk/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/sk/OrchardCore.Users.Core.po b/Localization/sk/OrchardCore.Users.Core.po
index 74991c6518c53..b77398a71201d 100644
--- a/Localization/sk/OrchardCore.Users.Core.po
+++ b/Localization/sk/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Email '{0}' je neplatný."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Neočakávaná chyba: '{0}'."
diff --git a/Localization/sk/OrchardCore.Users.po b/Localization/sk/OrchardCore.Users.po
index dccfbc61d7bcc..c77ea77c5e152 100644
--- a/Localization/sk/OrchardCore.Users.po
+++ b/Localization/sk/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Používateľ bol vytvorený"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Lokálne prihlasovanie nie je povolené."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Neplatný pokus o prihlásenie."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "U externého poskytovateľa sa vyskytla chyba."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Registrácia nie je povolená."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Potvrďte účet"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Používateľ sa nemôže prihlásiť."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Potvrďte prosím email."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Názov"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Schváliť"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Povoliť"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Zakázať"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Zmazať"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Používateľ  {0}  schválený."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Používateľ  {0}  zmazaný."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Používateľ  {0}  deaktivovaný."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Používateľ  {0}  aktivovaný."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Používateľ bol vytvorený."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Používateľ bol aktualizovaný."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Používateľ  bol zmazaný."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Nepodarilo sa vymazať používateľa."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Heslo bolo aktualizované."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Nastavenia prihlasovania"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Exportuje nastavenia prihlasovania."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Nastavenie zmeny emailu"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Exportuje nastavenia zmeny emailu."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Nastavenia registrácie"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Exportuje nastavenia registrácie."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Nastavenia obnovy hesla"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Exportuje nastavenia obnovenia hesla."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Heslá sa nezhodujú."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Používateľ"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Zlyhalo"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Platné"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Neplatné"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Nie je dostupná žiadna emailová služba"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Udalosť aktualizácie používateľa"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Používateľ"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonymný"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Autentifikovaný"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} do role {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Používateľ, ktorému chcete priradiť rolu. Podporuje Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Nové heslo"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Vytvoriť používateľa"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Upraviť heslo"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nové heslo"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Skontrolujte svoj email a obnovte svoje heslo."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Zmeniť email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Úspešne ste sa prihlásili pomocou <strong>{0}</strong>. Účet s touto e-mailovou adresou už máte. Zadajte heslo svojho miestneho účtu a kliknutím na tlačidlo Registrovať prepojte účty a dokončite prihlásenie."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Prihlasovacie meno"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Použiť na prihlásenie inú službu"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "Prihláste sa svojím účtom {0}"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Vytvoriť používateľa"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Prihlasovacie meno"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Heslo"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Úspešne ste sa prihlásili pomocou <strong>{0}</strong>. Pre dokončenie registrácie vyplňte formulár a kliknite Registrovať."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Prihlasovacie meno"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Heslo"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Zaslať overovací email"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Subjekt overovacej emailovej správy. Podporuje Liquid."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Obnovenie hesla"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Nové heslo"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Používateľ je deaktivovaný."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Používateľ je aktivovaný."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Odškrtnite pre deaktiváciu účtu."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,17 +3518,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Nastaviť vlastnosť worflow 'UserName' ak je používateľ autentifikovaný"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Roly"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "'InRole' sa spustí, ak má používateľ aspoň jednu z vybratých rolí."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/sk/OrchardCore.Widgets.po b/Localization/sk/OrchardCore.Widgets.po
index ae2f86379cddf..92e3aa560074c 100644
--- a/Localization/sk/OrchardCore.Widgets.po
+++ b/Localization/sk/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Pridať Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Štandardné"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/sk/OrchardCore.Workflows.po b/Localization/sk/OrchardCore.Workflows.po
index 3d4d5d2f4637f..ba4ba5b84fbff 100644
--- a/Localization/sk/OrchardCore.Workflows.po
+++ b/Localization/sk/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Základné prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Opakovať"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Opakovať"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Pravda"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Nepravda"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Zlúčené"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Základné prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Hotovo"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Výnimky"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Základné prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Základné prvky"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Riadiaci tok"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Opakovať"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Hotovo"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Aktivita upravená úspešne."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Nedávno vytvorené"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Naposledy vytvorené"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Zlyhané"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Dokončené"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Pracovný postup {0} bol odstránený."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Pracovný postup {0} bol odstránený."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Pracovný postup bol uložený."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Pracovný postup {0} bol odstránený"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Hotovo"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Hotovo"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Zhoduje sa"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Neošetrený HTTP status"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Hotovo"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Nie ste autorizovaný spustiť '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Úvodné akcie"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Upraviť"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Pridať"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Porovnať"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Späť"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Naozaj chcete inštanciu pracovného postupu zmazať?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Zmazať"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Dostupné udalosti"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Dostupné akcie"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Naozaj chcete aktivitu zmazať?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtrovať"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Opakovať pre <em>{0}</em> z <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Zoznam pre iteráciu. Podporuje JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Žiadne vetvy"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Iterovať <em>{0}</em> od <em>{1}</em> do <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Počiatočná hodnota. Podporuje JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Koncová hodnota. Podporuje JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Krok cyklu. Podporuje JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Presmerovanie HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "URL presmerovania. Podporuje Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Trvalé"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Zaškrtnite pre trvalé presmerovanie (301). Ponechajte nezaškrtnuté ak má byť presmerovanie dočasné (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Spracovať prichádzajúcu HTTP požiadavku"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Kdokoľvek kto zavolá túto URL spustí tento pracovný postup. Uchovajte ju v bezpečí."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Overiť Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Odškrtnite ak pracovný postup slúži na spracovanie požiadaviek zo služby ktorá použva túto URL ako webhook. Ak URL slúži na spracovanie požiadaviek z webového formulára, nechajte zaškrtnuté aby ste zaistili, že obsah formuláru nebol podvrhnutý."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Platnosť tokenu"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Po zmene tejto hodnoty stlačte tlačidlo <b>Pregenerovať</b>."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Počet dní do vypršania platnosti tokenu. 0 pre token, ktorý nevyprší"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Filtrovať prichádzajúcu HTTP požiadavku"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "HTTP metóda."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Názov kontroléru."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Názov akcie."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "URL pre odoslanie požiadavky. Podporuje Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "HTTP metóda. Napríklad: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Typ obsahu tela požiadavky."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Telo HTTP požiadavky pre metódy POST, PUT a PATCH. Podporuje Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Zadajte ďaľšie HTTP hlavičky, každý pár kľúč/hodnota na nový riadok. Príklad: \"X-MyHeader: Foo\". Podporuje Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP odpoveď"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Stavový kód odpovede. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Zobraziť zoznam</a>."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Typ obsahu tela odpovede."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Telo odpovede. Podporuje Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Vyhodnotiť <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Zoradiť"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Naozaj chcete inštanciu pracovného postupu zmazať?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Vytvorené {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong> Nič tu nie je! </strong> Momentálne neexistujú žiadne pozastavené pracovné postupy."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Späť"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "vybraný"
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Zakázať"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1. inštancia"
-msgstr[1] "{0} inštancie"
-msgstr[2] "{0} inštancií"
-msgstr[3] "{0} inštancií"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Čakať na <strong>akúkoľvek</strong> vstupujúcu vetvu pred pojením do jednej."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Úrovne logu."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} upozornenie"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Typ oznámenia."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Skript"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Čiarkami oddelený zoznam dostupných výstupov."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Výstup cez {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Názov výstupu."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Nastaviť vlastnosť {0}"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Premenná, ktorá se má nastaviť. Ak neexistuje, bude pridaná."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Ak je <em>{0}</em> spustený"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Akcia nebola špecifikovaná"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Zadajte jedno alebo viac názvov akcií oddelených čiarkou."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Opakovať pokiaľ <em>{0}</em> je pravda"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Iterovat, dokud je podmínka pravdivá."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/sk/TheAdmin.po b/Localization/sk/TheAdmin.po
index 99ee3249d47f5..b4a6bf94a2d6f 100644
--- a/Localization/sk/TheAdmin.po
+++ b/Localization/sk/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Svetlý mód"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Tmavý mód"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Navštíviť stránku"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Zbaliť/rozbaliť menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Zmazať"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Naozaj chcete položku zmazať?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "OK"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -75,26 +53,52 @@ msgstr "Filtrovať"
 #: TheAdmin\Views\Pager_First.cshtml:0
 msgctxt "TheAdmin.Views.Pager_First"
 msgid "Go to first page."
-msgstr ""
+msgstr "Prejsť na prvú stránku."
 
 #: TheAdmin\Views\Pager_Last.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Last"
 msgid "Go to last page."
-msgstr ""
+msgstr "Prejsť na poslednú stránku."
 
 #: TheAdmin\Views\Pager_Next.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Next"
 msgid "Go to next page."
-msgstr ""
+msgstr "Prejsť na ďalšiu stránku."
 
 #: TheAdmin\Views\Pager_Previous.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Previous"
 msgid "Go to previous page."
-msgstr ""
+msgstr "Prejsť na predchádzajúcu stránku."
 
 #. <nav aria-label="@T["Listing pages"]">
 #: TheAdmin\Views\Pager.cshtml:6
 msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
+msgstr "Zoznam stránok"
+
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
 msgstr ""
 
diff --git a/Localization/sk/TheAgencyTheme.po b/Localization/sk/TheAgencyTheme.po
index 94df91ef610a1..7916bc300cc0d 100644
--- a/Localization/sk/TheAgencyTheme.po
+++ b/Localization/sk/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sk/TheBlogTheme.po b/Localization/sk/TheBlogTheme.po
index 8e45d39790704..6d6a574d54394 100644
--- a/Localization/sk/TheBlogTheme.po
+++ b/Localization/sk/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sk/TheTheme.po b/Localization/sk/TheTheme.po
index 1821c716c405b..0f8dd62b777c6 100644
--- a/Localization/sk/TheTheme.po
+++ b/Localization/sk/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/sl/OrchardCore.Admin.po b/Localization/sl/OrchardCore.Admin.po
index c825cd360f5dc..78ccfc7a1d833 100644
--- a/Localization/sl/OrchardCore.Admin.po
+++ b/Localization/sl/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr ""
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/sl/OrchardCore.AdminDashboard.po b/Localization/sl/OrchardCore.AdminDashboard.po
index 9ee7993d089bf..c99c94da7e8fc 100644
--- a/Localization/sl/OrchardCore.AdminDashboard.po
+++ b/Localization/sl/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/sl/OrchardCore.AdminMenu.po b/Localization/sl/OrchardCore.AdminMenu.po
index 9e82dff10ab4a..f601f4809a6b5 100644
--- a/Localization/sl/OrchardCore.AdminMenu.po
+++ b/Localization/sl/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Alias.po b/Localization/sl/OrchardCore.Alias.po
index 5a2a1cfccaaa4..223e30e9b196e 100644
--- a/Localization/sl/OrchardCore.Alias.po
+++ b/Localization/sl/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sl/OrchardCore.ArchiveLater.po b/Localization/sl/OrchardCore.ArchiveLater.po
index b7b17ced7cfe2..410cecbd24e66 100644
--- a/Localization/sl/OrchardCore.ArchiveLater.po
+++ b/Localization/sl/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sl/OrchardCore.AuditTrail.po b/Localization/sl/OrchardCore.AuditTrail.po
index 17c6c52c71a1a..8a4b329a094a8 100644
--- a/Localization/sl/OrchardCore.AuditTrail.po
+++ b/Localization/sl/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/sl/OrchardCore.Autoroute.po b/Localization/sl/OrchardCore.Autoroute.po
index b10fa9308ff51..fc6499b74030b 100644
--- a/Localization/sl/OrchardCore.Autoroute.po
+++ b/Localization/sl/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sl/OrchardCore.BackgroundTasks.po b/Localization/sl/OrchardCore.BackgroundTasks.po
index 671551bb543d2..02ab3fe821adf 100644
--- a/Localization/sl/OrchardCore.BackgroundTasks.po
+++ b/Localization/sl/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/sl/OrchardCore.ContentFields.po b/Localization/sl/OrchardCore.ContentFields.po
index 4988e870d9f08..f31a83da0935a 100644
--- a/Localization/sl/OrchardCore.ContentFields.po
+++ b/Localization/sl/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/sl/OrchardCore.ContentLocalization.po b/Localization/sl/OrchardCore.ContentLocalization.po
index 0afe006fbd2cc..70485d835b19a 100644
--- a/Localization/sl/OrchardCore.ContentLocalization.po
+++ b/Localization/sl/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/sl/OrchardCore.ContentPreview.po b/Localization/sl/OrchardCore.ContentPreview.po
index f65c97d21948c..ea4c602ba10fb 100644
--- a/Localization/sl/OrchardCore.ContentPreview.po
+++ b/Localization/sl/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sl/OrchardCore.ContentTypes.po b/Localization/sl/OrchardCore.ContentTypes.po
index 3dba558953a8b..35ae17910f75c 100644
--- a/Localization/sl/OrchardCore.ContentTypes.po
+++ b/Localization/sl/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Contents.po b/Localization/sl/OrchardCore.Contents.po
index 7dc03914a7092..230701d9b3fcf 100644
--- a/Localization/sl/OrchardCore.Contents.po
+++ b/Localization/sl/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/sl/OrchardCore.CustomSettings.po b/Localization/sl/OrchardCore.CustomSettings.po
index d22ee9b81de8c..acedd1a98d031 100644
--- a/Localization/sl/OrchardCore.CustomSettings.po
+++ b/Localization/sl/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/sl/OrchardCore.Data.YesSql.po b/Localization/sl/OrchardCore.Data.YesSql.po
index fdf1a9a07dacb..7bbb722f6cee7 100644
--- a/Localization/sl/OrchardCore.Data.YesSql.po
+++ b/Localization/sl/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Demo.po b/Localization/sl/OrchardCore.Demo.po
index 0edd5c0bd1454..434a39d4ab0b8 100644
--- a/Localization/sl/OrchardCore.Demo.po
+++ b/Localization/sl/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/sl/OrchardCore.Deployment.Remote.po b/Localization/sl/OrchardCore.Deployment.Remote.po
index f3f9acc63e722..fb0821c4dcb38 100644
--- a/Localization/sl/OrchardCore.Deployment.Remote.po
+++ b/Localization/sl/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/sl/OrchardCore.Deployment.po b/Localization/sl/OrchardCore.Deployment.po
index 3fef06a18e225..5e6fb6aabd9c0 100644
--- a/Localization/sl/OrchardCore.Deployment.po
+++ b/Localization/sl/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/sl/OrchardCore.Diagnostics.po b/Localization/sl/OrchardCore.Diagnostics.po
index f5e60c371ba5a..59e28b3bedc2c 100644
--- a/Localization/sl/OrchardCore.Diagnostics.po
+++ b/Localization/sl/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2021-07-15 18:35\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/sl/OrchardCore.Email.Abstractions.po b/Localization/sl/OrchardCore.Email.Abstractions.po
index 1cb2964536a87..d6085d8e33213 100644
--- a/Localization/sl/OrchardCore.Email.Abstractions.po
+++ b/Localization/sl/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Email.po b/Localization/sl/OrchardCore.Email.po
index 93a408ac5849b..1cce2da36d666 100644
--- a/Localization/sl/OrchardCore.Email.po
+++ b/Localization/sl/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/sl/OrchardCore.Facebook.po b/Localization/sl/OrchardCore.Facebook.po
index 55bf63bf0bada..4bb9887269afe 100644
--- a/Localization/sl/OrchardCore.Facebook.po
+++ b/Localization/sl/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/sl/OrchardCore.Features.po b/Localization/sl/OrchardCore.Features.po
index 95cd1b79cc76d..463c65d8a28e4 100644
--- a/Localization/sl/OrchardCore.Features.po
+++ b/Localization/sl/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Flows.po b/Localization/sl/OrchardCore.Flows.po
index 1c5de84e00bb0..581f3051cf218 100644
--- a/Localization/sl/OrchardCore.Flows.po
+++ b/Localization/sl/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/sl/OrchardCore.Forms.po b/Localization/sl/OrchardCore.Forms.po
index aef5fca7e5e73..1195fcff773c9 100644
--- a/Localization/sl/OrchardCore.Forms.po
+++ b/Localization/sl/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:32\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/sl/OrchardCore.GitHub.po b/Localization/sl/OrchardCore.GitHub.po
index a3dc79905d9f6..8af177c6c5d48 100644
--- a/Localization/sl/OrchardCore.GitHub.po
+++ b/Localization/sl/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sl/OrchardCore.Google.po b/Localization/sl/OrchardCore.Google.po
index b4e285878ec32..3c364f5df9e02 100644
--- a/Localization/sl/OrchardCore.Google.po
+++ b/Localization/sl/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/sl/OrchardCore.Html.po b/Localization/sl/OrchardCore.Html.po
index d50c612b7839b..d11964ed1cdd7 100644
--- a/Localization/sl/OrchardCore.Html.po
+++ b/Localization/sl/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Https.po b/Localization/sl/OrchardCore.Https.po
index 73cd1355979ed..a18e3d8d41ced 100644
--- a/Localization/sl/OrchardCore.Https.po
+++ b/Localization/sl/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/sl/OrchardCore.Infrastructure.Abstractions.po b/Localization/sl/OrchardCore.Infrastructure.Abstractions.po
index 1abb878f22f07..172397b6ca8b8 100644
--- a/Localization/sl/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/sl/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-03-05 10:51\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/sl/OrchardCore.Layers.po b/Localization/sl/OrchardCore.Layers.po
index 0a59922b34c51..884979182c771 100644
--- a/Localization/sl/OrchardCore.Layers.po
+++ b/Localization/sl/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/sl/OrchardCore.Liquid.po b/Localization/sl/OrchardCore.Liquid.po
index a645d98fa42a8..4dad1527b1799 100644
--- a/Localization/sl/OrchardCore.Liquid.po
+++ b/Localization/sl/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/sl/OrchardCore.Lists.po b/Localization/sl/OrchardCore.Lists.po
index 408f50b5f34b1..3482dd23d5ef8 100644
--- a/Localization/sl/OrchardCore.Lists.po
+++ b/Localization/sl/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/sl/OrchardCore.Localization.po b/Localization/sl/OrchardCore.Localization.po
index 070cba7ff335c..6982171b89aa0 100644
--- a/Localization/sl/OrchardCore.Localization.po
+++ b/Localization/sl/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/sl/OrchardCore.Markdown.po b/Localization/sl/OrchardCore.Markdown.po
index da6f20bd16713..bf705a778da59 100644
--- a/Localization/sl/OrchardCore.Markdown.po
+++ b/Localization/sl/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sl/OrchardCore.Media.po b/Localization/sl/OrchardCore.Media.po
index 60946f6505ebd..68b3dc00bce1a 100644
--- a/Localization/sl/OrchardCore.Media.po
+++ b/Localization/sl/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sl/OrchardCore.Menu.po b/Localization/sl/OrchardCore.Menu.po
index 1f8adb3095f63..83f81a4820d88 100644
--- a/Localization/sl/OrchardCore.Menu.po
+++ b/Localization/sl/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/sl/OrchardCore.Microsoft.Authentication.po b/Localization/sl/OrchardCore.Microsoft.Authentication.po
index 89842e715c911..2c435133a6db0 100644
--- a/Localization/sl/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/sl/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sl/OrchardCore.Navigation.po b/Localization/sl/OrchardCore.Navigation.po
index e519959b1815b..bf3d9d3628641 100644
--- a/Localization/sl/OrchardCore.Navigation.po
+++ b/Localization/sl/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Notifications.po b/Localization/sl/OrchardCore.Notifications.po
index 2b46e7684e01c..bea4bacd6ff62 100644
--- a/Localization/sl/OrchardCore.Notifications.po
+++ b/Localization/sl/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/sl/OrchardCore.OpenId.po b/Localization/sl/OrchardCore.OpenId.po
index eb1858cbfb2d4..f0943097fb0b0 100644
--- a/Localization/sl/OrchardCore.OpenId.po
+++ b/Localization/sl/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/sl/OrchardCore.Placements.po b/Localization/sl/OrchardCore.Placements.po
index 23c30eb0e5a38..da617cc8ef8eb 100644
--- a/Localization/sl/OrchardCore.Placements.po
+++ b/Localization/sl/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/sl/OrchardCore.ProjectTemplates.po b/Localization/sl/OrchardCore.ProjectTemplates.po
index b0a8d3435c488..6ed75213358a3 100644
--- a/Localization/sl/OrchardCore.ProjectTemplates.po
+++ b/Localization/sl/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:32\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sl/OrchardCore.PublishLater.po b/Localization/sl/OrchardCore.PublishLater.po
index 2c0811cc7c3f1..83af1fa66d973 100644
--- a/Localization/sl/OrchardCore.PublishLater.po
+++ b/Localization/sl/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sl/OrchardCore.Queries.po b/Localization/sl/OrchardCore.Queries.po
index 40d7b0fbd2977..08b3eee9255d6 100644
--- a/Localization/sl/OrchardCore.Queries.po
+++ b/Localization/sl/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/sl/OrchardCore.ReCaptcha.Core.po b/Localization/sl/OrchardCore.ReCaptcha.Core.po
index 56c6361331378..3b942c6b9d462 100644
--- a/Localization/sl/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/sl/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/sl/OrchardCore.ReCaptcha.po b/Localization/sl/OrchardCore.ReCaptcha.po
index 3c26db55a640f..21729cf200e87 100644
--- a/Localization/sl/OrchardCore.ReCaptcha.po
+++ b/Localization/sl/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/sl/OrchardCore.Recipes.Core.po b/Localization/sl/OrchardCore.Recipes.Core.po
index 634e93b778ed3..cd57664af5354 100644
--- a/Localization/sl/OrchardCore.Recipes.Core.po
+++ b/Localization/sl/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/sl/OrchardCore.Roles.po b/Localization/sl/OrchardCore.Roles.po
index d0df05a748004..2f125c95c4947 100644
--- a/Localization/sl/OrchardCore.Roles.po
+++ b/Localization/sl/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/sl/OrchardCore.Rules.po b/Localization/sl/OrchardCore.Rules.po
index db56fb6e7c566..b0166913ec421 100644
--- a/Localization/sl/OrchardCore.Rules.po
+++ b/Localization/sl/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/sl/OrchardCore.Search.Elasticsearch.po b/Localization/sl/OrchardCore.Search.Elasticsearch.po
index 2ae1a9185fa34..a4c0358317bfe 100644
--- a/Localization/sl/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/sl/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/sl/OrchardCore.Search.Lucene.po b/Localization/sl/OrchardCore.Search.Lucene.po
index 0e50db351de18..6b81b504021de 100644
--- a/Localization/sl/OrchardCore.Search.Lucene.po
+++ b/Localization/sl/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Search.po b/Localization/sl/OrchardCore.Search.po
index 0f85ba42d2229..edbc4a6884036 100644
--- a/Localization/sl/OrchardCore.Search.po
+++ b/Localization/sl/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/sl/OrchardCore.Security.po b/Localization/sl/OrchardCore.Security.po
index 98edf588704c8..a5f70b1d3eaaf 100644
--- a/Localization/sl/OrchardCore.Security.po
+++ b/Localization/sl/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/sl/OrchardCore.Seo.po b/Localization/sl/OrchardCore.Seo.po
index 8203bfcf1d69b..f49f8aeae5a7d 100644
--- a/Localization/sl/OrchardCore.Seo.po
+++ b/Localization/sl/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/sl/OrchardCore.Settings.po b/Localization/sl/OrchardCore.Settings.po
index a21e9403a0592..b41d5f1fa1530 100644
--- a/Localization/sl/OrchardCore.Settings.po
+++ b/Localization/sl/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/sl/OrchardCore.Setup.Core.po b/Localization/sl/OrchardCore.Setup.Core.po
index 8f59cb7662226..5084d7df4d87b 100644
--- a/Localization/sl/OrchardCore.Setup.Core.po
+++ b/Localization/sl/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/sl/OrchardCore.Setup.po b/Localization/sl/OrchardCore.Setup.po
index 99d91e4171598..d8b45f608550d 100644
--- a/Localization/sl/OrchardCore.Setup.po
+++ b/Localization/sl/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/sl/OrchardCore.Shortcodes.po b/Localization/sl/OrchardCore.Shortcodes.po
index 4ecf5a2b04717..fd6bb79244058 100644
--- a/Localization/sl/OrchardCore.Shortcodes.po
+++ b/Localization/sl/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/sl/OrchardCore.Sitemaps.po b/Localization/sl/OrchardCore.Sitemaps.po
index 00a671e75dc94..2d45d98f3c521 100644
--- a/Localization/sl/OrchardCore.Sitemaps.po
+++ b/Localization/sl/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/sl/OrchardCore.Sms.po b/Localization/sl/OrchardCore.Sms.po
index 41c17f9aa84eb..94a99b80f4915 100644
--- a/Localization/sl/OrchardCore.Sms.po
+++ b/Localization/sl/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/sl/OrchardCore.Spatial.po b/Localization/sl/OrchardCore.Spatial.po
index 12b72d12ac564..197f68957c096 100644
--- a/Localization/sl/OrchardCore.Spatial.po
+++ b/Localization/sl/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sl/OrchardCore.Taxonomies.po b/Localization/sl/OrchardCore.Taxonomies.po
index 6c645f6fcf05a..f73414ab8b379 100644
--- a/Localization/sl/OrchardCore.Taxonomies.po
+++ b/Localization/sl/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Templates.Cms.Module.po b/Localization/sl/OrchardCore.Templates.Cms.Module.po
index 5ad325bd2a423..b32fec069ea77 100644
--- a/Localization/sl/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/sl/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sl/OrchardCore.Templates.po b/Localization/sl/OrchardCore.Templates.po
index 9798a88baa04c..3b7b4ebec7cf8 100644
--- a/Localization/sl/OrchardCore.Templates.po
+++ b/Localization/sl/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/sl/OrchardCore.Tenants.po b/Localization/sl/OrchardCore.Tenants.po
index 8fe5d976b6a7c..e7b5f9dd192c0 100644
--- a/Localization/sl/OrchardCore.Tenants.po
+++ b/Localization/sl/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/sl/OrchardCore.Tests.po b/Localization/sl/OrchardCore.Tests.po
index f8ca5cab227fa..0bf360b498256 100644
--- a/Localization/sl/OrchardCore.Tests.po
+++ b/Localization/sl/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Themes.po b/Localization/sl/OrchardCore.Themes.po
index a32e8a9305c58..81ab5a80ba43b 100644
--- a/Localization/sl/OrchardCore.Themes.po
+++ b/Localization/sl/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sl/OrchardCore.Title.po b/Localization/sl/OrchardCore.Title.po
index b59f080fbd55f..c075901176297 100644
--- a/Localization/sl/OrchardCore.Title.po
+++ b/Localization/sl/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sl/OrchardCore.Twitter.po b/Localization/sl/OrchardCore.Twitter.po
index e1b4fc6790714..0e94a4075ccec 100644
--- a/Localization/sl/OrchardCore.Twitter.po
+++ b/Localization/sl/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/sl/OrchardCore.Users.Core.po b/Localization/sl/OrchardCore.Users.Core.po
index b3718f990beb9..076639d177eb9 100644
--- a/Localization/sl/OrchardCore.Users.Core.po
+++ b/Localization/sl/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/sl/OrchardCore.Users.po b/Localization/sl/OrchardCore.Users.po
index 184ba8f5c6689..46cb9fdf8d7a3 100644
--- a/Localization/sl/OrchardCore.Users.po
+++ b/Localization/sl/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,16 +3518,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/sl/OrchardCore.Widgets.po b/Localization/sl/OrchardCore.Widgets.po
index 302f5dd6b3a62..b086eed8d66b1 100644
--- a/Localization/sl/OrchardCore.Widgets.po
+++ b/Localization/sl/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/sl/OrchardCore.Workflows.po b/Localization/sl/OrchardCore.Workflows.po
index 39d570c5c1c52..7a2f31a257cf6 100644
--- a/Localization/sl/OrchardCore.Workflows.po
+++ b/Localization/sl/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/sl/TheAdmin.po b/Localization/sl/TheAdmin.po
index 3451acb18bd18..cb5c9770a37e1 100644
--- a/Localization/sl/TheAdmin.po
+++ b/Localization/sl/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sl/TheAgencyTheme.po b/Localization/sl/TheAgencyTheme.po
index 6951b38720e6f..b207a8efff924 100644
--- a/Localization/sl/TheAgencyTheme.po
+++ b/Localization/sl/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sl/TheBlogTheme.po b/Localization/sl/TheBlogTheme.po
index 94faf12406138..4f239616ec986 100644
--- a/Localization/sl/TheBlogTheme.po
+++ b/Localization/sl/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-02-17 17:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sl/TheTheme.po b/Localization/sl/TheTheme.po
index 4e26203d62434..19a81888257ad 100644
--- a/Localization/sl/TheTheme.po
+++ b/Localization/sl/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Admin.po b/Localization/sr-cyrl-RS/OrchardCore.Admin.po
index 339915d9ccbc0..9bb49f7d983cd 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Admin.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr ""
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/OrchardCore.AdminDashboard.po b/Localization/sr-cyrl-RS/OrchardCore.AdminDashboard.po
index 677ecb1627559..1a9433555ebfd 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.AdminDashboard.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.AdminMenu.po b/Localization/sr-cyrl-RS/OrchardCore.AdminMenu.po
index f79b068b21608..f1529e0a86f08 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.AdminMenu.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -573,7 +573,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -585,7 +585,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -598,49 +598,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Alias.po b/Localization/sr-cyrl-RS/OrchardCore.Alias.po
index fccb4972b36c6..06dc2b699aa73 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Alias.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ArchiveLater.po b/Localization/sr-cyrl-RS/OrchardCore.ArchiveLater.po
index 6f6c470013762..e46e98b5a5758 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ArchiveLater.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-10-11 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.AuditTrail.po b/Localization/sr-cyrl-RS/OrchardCore.AuditTrail.po
index fea0ba929ad9e..c58c2c62546c0 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.AuditTrail.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -579,7 +579,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -633,7 +633,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -645,7 +645,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Autoroute.po b/Localization/sr-cyrl-RS/OrchardCore.Autoroute.po
index 5e2b3d0098b28..95c763ed0ed12 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Autoroute.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.BackgroundTasks.po b/Localization/sr-cyrl-RS/OrchardCore.BackgroundTasks.po
index 03805045a062c..1e3b326690836 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.BackgroundTasks.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-22 07:37\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ContentFields.po b/Localization/sr-cyrl-RS/OrchardCore.ContentFields.po
index 884f4d931078d..2083a3c537537 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ContentFields.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ContentLocalization.po b/Localization/sr-cyrl-RS/OrchardCore.ContentLocalization.po
index f1b76428d9a64..5c85012b40b2e 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ContentLocalization.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ContentPreview.po b/Localization/sr-cyrl-RS/OrchardCore.ContentPreview.po
index 2f924cb2a04e1..2defdc372e38f 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ContentPreview.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-10 12:01\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ContentTypes.po b/Localization/sr-cyrl-RS/OrchardCore.ContentTypes.po
index 0e2ca8e3679e5..20163a889cb54 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ContentTypes.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-10 12:01\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Contents.po b/Localization/sr-cyrl-RS/OrchardCore.Contents.po
index e4384f29800b1..a9ad8ab50ed63 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Contents.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1737,7 +1737,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1779,13 +1779,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1835,9 +1835,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1851,9 +1851,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2029,7 +2029,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2065,7 +2065,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2101,7 +2101,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2137,7 +2137,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2173,7 +2173,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2197,7 +2197,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2239,7 +2239,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2287,37 +2287,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2347,7 +2347,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2437,7 +2437,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2513,8 +2513,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2537,7 +2537,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2579,7 +2579,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2621,7 +2621,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2663,7 +2663,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2675,7 +2675,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.CustomSettings.po b/Localization/sr-cyrl-RS/OrchardCore.CustomSettings.po
index 859b38d768c0f..af72654b0f1e6 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.CustomSettings.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Data.YesSql.po b/Localization/sr-cyrl-RS/OrchardCore.Data.YesSql.po
index 8da499ab8e3d6..379bc0e781718 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Data.YesSql.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Demo.po b/Localization/sr-cyrl-RS/OrchardCore.Demo.po
index 91743835c4696..56af0f031d83d 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Demo.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Deployment.Remote.po b/Localization/sr-cyrl-RS/OrchardCore.Deployment.Remote.po
index 44308cadcee4d..2891455f70c42 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Deployment.Remote.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Deployment.po b/Localization/sr-cyrl-RS/OrchardCore.Deployment.po
index 95428a5335829..25aa73a012933 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Deployment.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -576,7 +576,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -618,7 +618,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -630,7 +630,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -642,7 +642,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -654,7 +654,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -666,7 +666,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -678,7 +678,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -690,7 +690,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -702,7 +702,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Diagnostics.po b/Localization/sr-cyrl-RS/OrchardCore.Diagnostics.po
index 9ebb2a5fad930..648092cb23702 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Diagnostics.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2021-07-15 18:35\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Email.Abstractions.po b/Localization/sr-cyrl-RS/OrchardCore.Email.Abstractions.po
index ea0c5f263e3eb..ce18d474a7d12 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Email.Abstractions.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-03-05 10:55\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Email.po b/Localization/sr-cyrl-RS/OrchardCore.Email.po
index 96a79c5d8bd45..54aa5be3d7804 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Email.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Facebook.po b/Localization/sr-cyrl-RS/OrchardCore.Facebook.po
index 70ff278d66364..3cfce327cf6b2 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Facebook.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Features.po b/Localization/sr-cyrl-RS/OrchardCore.Features.po
index 15fc9fbeec934..7436cd6af3189 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Features.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Flows.po b/Localization/sr-cyrl-RS/OrchardCore.Flows.po
index c19efc1bd27fc..8eda57da269ed 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Flows.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Forms.po b/Localization/sr-cyrl-RS/OrchardCore.Forms.po
index 293282ece1bdb..2a084816f5392 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Forms.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.GitHub.po b/Localization/sr-cyrl-RS/OrchardCore.GitHub.po
index 6fcf568e47910..c790e127168a4 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.GitHub.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Google.po b/Localization/sr-cyrl-RS/OrchardCore.Google.po
index 2c0698e46e54d..55f69dfd7ef17 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Google.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Html.po b/Localization/sr-cyrl-RS/OrchardCore.Html.po
index 7252299a3161b..a73727c0e213b 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Html.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Https.po b/Localization/sr-cyrl-RS/OrchardCore.Https.po
index 94bb2228479a7..12c342cf1eb60 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Https.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 16:46\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Infrastructure.Abstractions.po b/Localization/sr-cyrl-RS/OrchardCore.Infrastructure.Abstractions.po
index bb7d2cb9cb1c7..4cae50a8f972d 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-03-05 10:55\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Layers.po b/Localization/sr-cyrl-RS/OrchardCore.Layers.po
index c2baf3b047973..1ca1e5303df61 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Layers.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Liquid.po b/Localization/sr-cyrl-RS/OrchardCore.Liquid.po
index 7dcd2ae714a25..32fe86b538fca 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Liquid.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Lists.po b/Localization/sr-cyrl-RS/OrchardCore.Lists.po
index 8a59491192726..10a372a2428e2 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Lists.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Localization.po b/Localization/sr-cyrl-RS/OrchardCore.Localization.po
index 9aab177b112a1..2c7677c20610b 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Localization.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Markdown.po b/Localization/sr-cyrl-RS/OrchardCore.Markdown.po
index e174424f1c94e..b28bcb9dea020 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Markdown.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Media.po b/Localization/sr-cyrl-RS/OrchardCore.Media.po
index 281d92c220da3..b7e2653e400c4 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Media.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -772,7 +772,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1004,7 +1004,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1062,13 +1062,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1087,43 +1087,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1134,49 +1134,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1296,7 +1296,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Menu.po b/Localization/sr-cyrl-RS/OrchardCore.Menu.po
index 517ea8ab737f6..89907df5aaca4 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Menu.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Microsoft.Authentication.po b/Localization/sr-cyrl-RS/OrchardCore.Microsoft.Authentication.po
index 82e9dffafc64e..69b5a218f797b 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Navigation.po b/Localization/sr-cyrl-RS/OrchardCore.Navigation.po
index 3a81ff1885dfa..a0c385ae7840c 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Navigation.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Notifications.po b/Localization/sr-cyrl-RS/OrchardCore.Notifications.po
index f6cc6534b65aa..7ae823cd49ec1 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Notifications.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -106,21 +106,21 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -146,15 +146,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -251,7 +251,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -260,13 +260,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -327,13 +327,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -345,7 +345,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -357,7 +357,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -381,10 +381,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -407,7 +407,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -419,7 +419,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -431,7 +431,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -455,37 +455,32 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.OpenId.po b/Localization/sr-cyrl-RS/OrchardCore.OpenId.po
index 3cf8661412d73..cae7131bf871d 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.OpenId.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Placements.po b/Localization/sr-cyrl-RS/OrchardCore.Placements.po
index 5c9ce626cfe06..f5c24144e6923 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Placements.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ProjectTemplates.po b/Localization/sr-cyrl-RS/OrchardCore.ProjectTemplates.po
index bcc9fe7febc09..e001f80c8b470 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ProjectTemplates.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.PublishLater.po b/Localization/sr-cyrl-RS/OrchardCore.PublishLater.po
index 222d804a16cff..db9cfa8ec43f6 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.PublishLater.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2021-07-15 18:56\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Queries.po b/Localization/sr-cyrl-RS/OrchardCore.Queries.po
index e3366ad7b4378..3163ed1b84ac4 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Queries.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -326,7 +326,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -362,7 +362,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -466,7 +466,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -478,7 +478,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.Core.po b/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.Core.po
index 46a3b6fba7aeb..85cf1d17ee958 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2021-07-15 19:00\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.po b/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.po
index c72e05e3810a5..d5a3afb745525 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Recipes.Core.po b/Localization/sr-cyrl-RS/OrchardCore.Recipes.Core.po
index ef7b06f769c61..b2633ff10a3ac 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Recipes.Core.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Roles.po b/Localization/sr-cyrl-RS/OrchardCore.Roles.po
index 341c0ae55bef8..6d5e04b3cef73 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Roles.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Rules.po b/Localization/sr-cyrl-RS/OrchardCore.Rules.po
index ba27d0354f1d2..58683f9c80a1b 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Rules.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Search.Elasticsearch.po b/Localization/sr-cyrl-RS/OrchardCore.Search.Elasticsearch.po
index e37e4e0af91b5..d93e0fe22b254 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -812,7 +848,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -854,7 +890,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -866,7 +902,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -884,7 +920,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Search.Lucene.po b/Localization/sr-cyrl-RS/OrchardCore.Search.Lucene.po
index dfd7894b7a8bf..3cf41ca581b88 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Search.Lucene.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -522,13 +522,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -570,13 +570,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -618,13 +618,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -648,7 +648,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -672,7 +672,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -690,7 +690,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -714,7 +714,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -816,7 +816,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -834,7 +834,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -865,7 +865,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Search.po b/Localization/sr-cyrl-RS/OrchardCore.Search.po
index ecae77b5f003a..6da13a68ee2e1 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Search.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Security.po b/Localization/sr-cyrl-RS/OrchardCore.Security.po
index c70e3ceed751e..bfd54497b0cb0 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Security.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-06-01 18:43\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Seo.po b/Localization/sr-cyrl-RS/OrchardCore.Seo.po
index af2191730460f..ad4639d7c7c58 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Seo.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-15 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Settings.po b/Localization/sr-cyrl-RS/OrchardCore.Settings.po
index a3eb54e9a859f..b10f7476e3bff 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Settings.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Setup.Core.po b/Localization/sr-cyrl-RS/OrchardCore.Setup.Core.po
index 02ea5e86c387e..2ae1174f45dde 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Setup.Core.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Setup.po b/Localization/sr-cyrl-RS/OrchardCore.Setup.po
index 98f3de3f51fb7..391961d1cf19e 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Setup.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Shortcodes.po b/Localization/sr-cyrl-RS/OrchardCore.Shortcodes.po
index 1d4240df85e14..1dc6ca1385371 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Shortcodes.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Sitemaps.po b/Localization/sr-cyrl-RS/OrchardCore.Sitemaps.po
index a6aaf29658901..b251672c0da11 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Sitemaps.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1024,7 +1024,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1036,7 +1036,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Sms.po b/Localization/sr-cyrl-RS/OrchardCore.Sms.po
index afd714a89d1a8..0a49dfe687c7d 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Sms.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Spatial.po b/Localization/sr-cyrl-RS/OrchardCore.Spatial.po
index 4914881f2c1c3..6b00e77d18f77 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Spatial.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Taxonomies.po b/Localization/sr-cyrl-RS/OrchardCore.Taxonomies.po
index 0231c0d83cd41..e5a61b3f95984 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Taxonomies.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Templates.Cms.Module.po b/Localization/sr-cyrl-RS/OrchardCore.Templates.Cms.Module.po
index b6db238ec0a33..e4f14973f6d30 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Templates.po b/Localization/sr-cyrl-RS/OrchardCore.Templates.po
index 286c763a4a115..d2128058eeca4 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Templates.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Tenants.po b/Localization/sr-cyrl-RS/OrchardCore.Tenants.po
index a041a3436f384..0afca28fc0f58 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Tenants.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1230,8 +1224,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1248,7 +1242,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1260,49 +1254,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1320,7 +1314,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Tests.po b/Localization/sr-cyrl-RS/OrchardCore.Tests.po
index 3d30d94223d96..f73162f649760 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Tests.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Themes.po b/Localization/sr-cyrl-RS/OrchardCore.Themes.po
index 63372a0d33627..1150b7bba3530 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Themes.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Title.po b/Localization/sr-cyrl-RS/OrchardCore.Title.po
index fe3b84be1139f..24d46207478d4 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Title.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Twitter.po b/Localization/sr-cyrl-RS/OrchardCore.Twitter.po
index 47ba0262c2e78..deaf393c7aa9f 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Twitter.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Users.Core.po b/Localization/sr-cyrl-RS/OrchardCore.Users.Core.po
index 0babc9a40734c..ed1e5d2951b8a 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Users.Core.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Users.po b/Localization/sr-cyrl-RS/OrchardCore.Users.po
index d58e83e7c69f3..d8a5cbeba2a0e 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Users.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3354,7 +3426,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3420,7 +3492,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3444,16 +3516,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Widgets.po b/Localization/sr-cyrl-RS/OrchardCore.Widgets.po
index 335a561ab49b1..3f1d31712df22 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Widgets.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/sr-cyrl-RS/OrchardCore.Workflows.po b/Localization/sr-cyrl-RS/OrchardCore.Workflows.po
index c592b9b96407d..dccb3ff622814 100644
--- a/Localization/sr-cyrl-RS/OrchardCore.Workflows.po
+++ b/Localization/sr-cyrl-RS/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1708,40 +1772,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1842,14 +1920,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1883,7 +1958,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1913,7 +1988,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1925,7 +2000,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1973,7 +2048,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1985,7 +2060,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2015,7 +2090,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2027,7 +2102,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2057,7 +2132,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2069,7 +2144,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2099,7 +2174,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2111,7 +2186,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2147,7 +2222,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2183,7 +2258,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2237,7 +2312,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2249,7 +2324,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2285,7 +2360,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2309,3 +2384,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/TheAdmin.po b/Localization/sr-cyrl-RS/TheAdmin.po
index 40da9b2503f78..4d76497cc9034 100644
--- a/Localization/sr-cyrl-RS/TheAdmin.po
+++ b/Localization/sr-cyrl-RS/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr ""
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sr-cyrl-RS/TheAgencyTheme.po b/Localization/sr-cyrl-RS/TheAgencyTheme.po
index 2d93fc9b0c99e..c260b948df17c 100644
--- a/Localization/sr-cyrl-RS/TheAgencyTheme.po
+++ b/Localization/sr-cyrl-RS/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sr-cyrl-RS/TheBlogTheme.po b/Localization/sr-cyrl-RS/TheBlogTheme.po
index 28fc6927f5ea7..b2b4967a943f4 100644
--- a/Localization/sr-cyrl-RS/TheBlogTheme.po
+++ b/Localization/sr-cyrl-RS/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-02-17 17:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sr-cyrl-RS/TheTheme.po b/Localization/sr-cyrl-RS/TheTheme.po
index 5cce84fed8995..395505110b253 100644
--- a/Localization/sr-cyrl-RS/TheTheme.po
+++ b/Localization/sr-cyrl-RS/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Cyrillic\n"
 "Language: sr_cyrl_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,54 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/OrchardCore.Admin.po b/Localization/sr-latn-RS/OrchardCore.Admin.po
index 7aef228bd2a2e..ca6e21102dcd1 100644
--- a/Localization/sr-latn-RS/OrchardCore.Admin.po
+++ b/Localization/sr-latn-RS/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Admin podešavanja"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Izvozi admin podešavanja."
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Slobodno se prošetajte kroz menije i istražite sve njegove mogućnosti."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/OrchardCore.AdminDashboard.po b/Localization/sr-latn-RS/OrchardCore.AdminDashboard.po
index f80daf2419c8f..9e04adabf81af 100644
--- a/Localization/sr-latn-RS/OrchardCore.AdminDashboard.po
+++ b/Localization/sr-latn-RS/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/sr-latn-RS/OrchardCore.AdminMenu.po b/Localization/sr-latn-RS/OrchardCore.AdminMenu.po
index f0699e93be97f..28938f6fee925 100644
--- a/Localization/sr-latn-RS/OrchardCore.AdminMenu.po
+++ b/Localization/sr-latn-RS/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -573,7 +573,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -585,7 +585,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -598,49 +598,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Alias.po b/Localization/sr-latn-RS/OrchardCore.Alias.po
index 1d0ecaa19d938..43f467efdcf36 100644
--- a/Localization/sr-latn-RS/OrchardCore.Alias.po
+++ b/Localization/sr-latn-RS/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-latn-RS/OrchardCore.ArchiveLater.po b/Localization/sr-latn-RS/OrchardCore.ArchiveLater.po
index ab427b7f03241..596dc061919c4 100644
--- a/Localization/sr-latn-RS/OrchardCore.ArchiveLater.po
+++ b/Localization/sr-latn-RS/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-10-11 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sr-latn-RS/OrchardCore.AuditTrail.po b/Localization/sr-latn-RS/OrchardCore.AuditTrail.po
index e8344a6638b23..5369ecf3abfd4 100644
--- a/Localization/sr-latn-RS/OrchardCore.AuditTrail.po
+++ b/Localization/sr-latn-RS/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -579,7 +579,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -633,7 +633,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -645,7 +645,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/sr-latn-RS/OrchardCore.Autoroute.po b/Localization/sr-latn-RS/OrchardCore.Autoroute.po
index 2b4088122add9..eb52aef2bf806 100644
--- a/Localization/sr-latn-RS/OrchardCore.Autoroute.po
+++ b/Localization/sr-latn-RS/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-latn-RS/OrchardCore.BackgroundTasks.po b/Localization/sr-latn-RS/OrchardCore.BackgroundTasks.po
index 6928017449700..69f3fe709690b 100644
--- a/Localization/sr-latn-RS/OrchardCore.BackgroundTasks.po
+++ b/Localization/sr-latn-RS/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/sr-latn-RS/OrchardCore.ContentFields.po b/Localization/sr-latn-RS/OrchardCore.ContentFields.po
index 0d8abcb04326e..209290bf25a1d 100644
--- a/Localization/sr-latn-RS/OrchardCore.ContentFields.po
+++ b/Localization/sr-latn-RS/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.ContentLocalization.po b/Localization/sr-latn-RS/OrchardCore.ContentLocalization.po
index a5354e82a3b4b..d3336bc430d0b 100644
--- a/Localization/sr-latn-RS/OrchardCore.ContentLocalization.po
+++ b/Localization/sr-latn-RS/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/sr-latn-RS/OrchardCore.ContentPreview.po b/Localization/sr-latn-RS/OrchardCore.ContentPreview.po
index bb188b85ef48f..28b9f85e7bd6f 100644
--- a/Localization/sr-latn-RS/OrchardCore.ContentPreview.po
+++ b/Localization/sr-latn-RS/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-latn-RS/OrchardCore.ContentTypes.po b/Localization/sr-latn-RS/OrchardCore.ContentTypes.po
index ef32f57b424c6..5d0c0eccbdfae 100644
--- a/Localization/sr-latn-RS/OrchardCore.ContentTypes.po
+++ b/Localization/sr-latn-RS/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Izbriši"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Contents.po b/Localization/sr-latn-RS/OrchardCore.Contents.po
index fb807855c7b3f..0d3d8c32e2496 100644
--- a/Localization/sr-latn-RS/OrchardCore.Contents.po
+++ b/Localization/sr-latn-RS/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Za sadržaj tipa '{0}' je uspešno ukinuta objava."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Sve vrste sadržaja"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Prilikom provere otkrivena je jedna ili više grešaka."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "Eksportuje podešavanja dnevnika nadzora sadržaja."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Sadržaj"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Gotovo"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "i nastavi"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Operacije"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bilo koja vrsta sadržaja"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bilo koja vrsta sadržaja"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Sadržaj"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bilo koja vrsta sadržaja"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "Nacrt sadržaja je snimljen."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bilo koja vrsta sadržaja"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1737,7 +1737,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Prikaži sve vrste sadržaja"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1779,13 +1779,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Izaberite ikonu"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Prikaži sve vrste sadržaja"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1835,9 +1835,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Ograniči broj stavki koje će biti dobijene iz ovog izvora. Napomena: kada je ova opcija aktivna, može se izabrati samo jedna vrsta sadržaja."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1851,9 +1851,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Podrazumevana frekvencija sa kojom se očekuje promena ovih vrsta sadržaja."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2029,7 +2029,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2065,7 +2065,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2101,7 +2101,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2137,7 +2137,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bilo koja vrsta sadržaja"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2173,7 +2173,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Kreiraj sadržaj"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2197,7 +2197,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2239,7 +2239,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Izbriši sadržaj koristeći izraz: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2287,37 +2287,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Pogledaj nacrt u JSON formatu"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Preuzmi nacrt u JSON formatu"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "Pogledaj objavljeno u JSON formatu"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "Preuzmi objavljeno u JSON formatu"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Pogledaj kao JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2347,7 +2347,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2437,7 +2437,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2513,8 +2513,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2537,7 +2537,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2579,7 +2579,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2621,7 +2621,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2663,7 +2663,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2675,7 +2675,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/sr-latn-RS/OrchardCore.CustomSettings.po b/Localization/sr-latn-RS/OrchardCore.CustomSettings.po
index c708464abdce6..e8ffce426a379 100644
--- a/Localization/sr-latn-RS/OrchardCore.CustomSettings.po
+++ b/Localization/sr-latn-RS/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/sr-latn-RS/OrchardCore.Data.YesSql.po b/Localization/sr-latn-RS/OrchardCore.Data.YesSql.po
index 7a6783502ab7c..5357d97d7794e 100644
--- a/Localization/sr-latn-RS/OrchardCore.Data.YesSql.po
+++ b/Localization/sr-latn-RS/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Demo.po b/Localization/sr-latn-RS/OrchardCore.Demo.po
index f1a23ef09fb98..faf61f968f628 100644
--- a/Localization/sr-latn-RS/OrchardCore.Demo.po
+++ b/Localization/sr-latn-RS/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/sr-latn-RS/OrchardCore.Deployment.Remote.po b/Localization/sr-latn-RS/OrchardCore.Deployment.Remote.po
index d97c0f125cf72..e6927b0798866 100644
--- a/Localization/sr-latn-RS/OrchardCore.Deployment.Remote.po
+++ b/Localization/sr-latn-RS/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/sr-latn-RS/OrchardCore.Deployment.po b/Localization/sr-latn-RS/OrchardCore.Deployment.po
index 95f3a53f26baf..e672e290fe466 100644
--- a/Localization/sr-latn-RS/OrchardCore.Deployment.po
+++ b/Localization/sr-latn-RS/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Izbriši"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -576,7 +576,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -618,7 +618,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -630,7 +630,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -642,7 +642,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -654,7 +654,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -666,7 +666,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -678,7 +678,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -690,7 +690,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -702,7 +702,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/sr-latn-RS/OrchardCore.Diagnostics.po b/Localization/sr-latn-RS/OrchardCore.Diagnostics.po
index 98d58664aeb76..3f20a8bcfe564 100644
--- a/Localization/sr-latn-RS/OrchardCore.Diagnostics.po
+++ b/Localization/sr-latn-RS/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2021-07-15 18:36\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/OrchardCore.Email.Abstractions.po b/Localization/sr-latn-RS/OrchardCore.Email.Abstractions.po
index 92ab2f2105adf..4c214618ac012 100644
--- a/Localization/sr-latn-RS/OrchardCore.Email.Abstractions.po
+++ b/Localization/sr-latn-RS/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Polje {0} je obavezno."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Način isporuke '{0}' nije podržan."
diff --git a/Localization/sr-latn-RS/OrchardCore.Email.po b/Localization/sr-latn-RS/OrchardCore.Email.po
index 4799f813215a5..347c3d79879b4 100644
--- a/Localization/sr-latn-RS/OrchardCore.Email.po
+++ b/Localization/sr-latn-RS/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/sr-latn-RS/OrchardCore.Facebook.po b/Localization/sr-latn-RS/OrchardCore.Facebook.po
index 73daeb36c7387..bc0c224df36f2 100644
--- a/Localization/sr-latn-RS/OrchardCore.Facebook.po
+++ b/Localization/sr-latn-RS/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/sr-latn-RS/OrchardCore.Features.po b/Localization/sr-latn-RS/OrchardCore.Features.po
index 0e5fdb1e0e4ed..10f5142f23c25 100644
--- a/Localization/sr-latn-RS/OrchardCore.Features.po
+++ b/Localization/sr-latn-RS/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Flows.po b/Localization/sr-latn-RS/OrchardCore.Flows.po
index 2e652c22196d8..d9c2f11a48464 100644
--- a/Localization/sr-latn-RS/OrchardCore.Flows.po
+++ b/Localization/sr-latn-RS/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Izbriši"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/sr-latn-RS/OrchardCore.Forms.po b/Localization/sr-latn-RS/OrchardCore.Forms.po
index 8425669ebfcf3..1f3e1ffa9c8d3 100644
--- a/Localization/sr-latn-RS/OrchardCore.Forms.po
+++ b/Localization/sr-latn-RS/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/sr-latn-RS/OrchardCore.GitHub.po b/Localization/sr-latn-RS/OrchardCore.GitHub.po
index b97c723a46970..65d6272109c27 100644
--- a/Localization/sr-latn-RS/OrchardCore.GitHub.po
+++ b/Localization/sr-latn-RS/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sr-latn-RS/OrchardCore.Google.po b/Localization/sr-latn-RS/OrchardCore.Google.po
index 1b56150fa64a2..29b63596fb5c2 100644
--- a/Localization/sr-latn-RS/OrchardCore.Google.po
+++ b/Localization/sr-latn-RS/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/sr-latn-RS/OrchardCore.Html.po b/Localization/sr-latn-RS/OrchardCore.Html.po
index 86d708937061c..075d3743c8aad 100644
--- a/Localization/sr-latn-RS/OrchardCore.Html.po
+++ b/Localization/sr-latn-RS/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Https.po b/Localization/sr-latn-RS/OrchardCore.Https.po
index 41e9d8694b4be..5bba3921e3a3b 100644
--- a/Localization/sr-latn-RS/OrchardCore.Https.po
+++ b/Localization/sr-latn-RS/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-17 16:46\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/sr-latn-RS/OrchardCore.Infrastructure.Abstractions.po b/Localization/sr-latn-RS/OrchardCore.Infrastructure.Abstractions.po
index 2b6f94fe2a8f2..13062eef0138c 100644
--- a/Localization/sr-latn-RS/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/sr-latn-RS/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/OrchardCore.Layers.po b/Localization/sr-latn-RS/OrchardCore.Layers.po
index b14803dfe173a..99514edf6b498 100644
--- a/Localization/sr-latn-RS/OrchardCore.Layers.po
+++ b/Localization/sr-latn-RS/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Izbriši"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/sr-latn-RS/OrchardCore.Liquid.po b/Localization/sr-latn-RS/OrchardCore.Liquid.po
index e0a067b700992..c098ed74ddc6a 100644
--- a/Localization/sr-latn-RS/OrchardCore.Liquid.po
+++ b/Localization/sr-latn-RS/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/sr-latn-RS/OrchardCore.Lists.po b/Localization/sr-latn-RS/OrchardCore.Lists.po
index 09271999a271d..e2795cac7a0b2 100644
--- a/Localization/sr-latn-RS/OrchardCore.Lists.po
+++ b/Localization/sr-latn-RS/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Navedeni blog post ne postoji. Molimo kreirajte novi blog post."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Niste ovlašćeni da izbrišete ovaj sadržaj"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Korisničko ime ili e-mail ili lozinka koji su dati su neispravni."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Lista je prazna"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Uključite ovu opciju da omogućite ručno zadavanje redosleda stavki."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Liste"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Dodaj nadređenu stavku menija"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/sr-latn-RS/OrchardCore.Localization.po b/Localization/sr-latn-RS/OrchardCore.Localization.po
index 57e82efd7932f..4041911295c8f 100644
--- a/Localization/sr-latn-RS/OrchardCore.Localization.po
+++ b/Localization/sr-latn-RS/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/sr-latn-RS/OrchardCore.Markdown.po b/Localization/sr-latn-RS/OrchardCore.Markdown.po
index e5d33e9523bd8..7893f0066ade5 100644
--- a/Localization/sr-latn-RS/OrchardCore.Markdown.po
+++ b/Localization/sr-latn-RS/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sr-latn-RS/OrchardCore.Media.po b/Localization/sr-latn-RS/OrchardCore.Media.po
index 969b5aad65d96..cc75cd89cfa5c 100644
--- a/Localization/sr-latn-RS/OrchardCore.Media.po
+++ b/Localization/sr-latn-RS/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Nije moguće premestiti medijski sadržaj zato što datoteka sa istim imenom već postoji"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Profil sa istim nazivom već postoji."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Profil medija uspešno izbrisan."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Profili medija uspešno izbrisani."
@@ -181,95 +181,95 @@ msgstr "Profili medija uspešno izbrisani."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Podrazumevano"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Prilagođena veličina"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Podrazumevano (Max)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Max"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Crop"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Pad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "BoxPad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Min"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Stretch"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Došlo je do greške u obradi datoteka."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Da li se resursi uzimaju samo iz glavnog direktorijuma ili i iz svih pod-direktorijuma."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -772,7 +772,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1004,7 +1004,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Kreiraj fasciklu"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Preimenuj stavku"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1062,13 +1062,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1087,43 +1087,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " male sličice"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " velike sličice"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1134,49 +1134,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Priloženo"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Standardni"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " male sličice"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " velike sličice"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1296,7 +1296,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sr-latn-RS/OrchardCore.Menu.po b/Localization/sr-latn-RS/OrchardCore.Menu.po
index c383e729c05aa..d932d8caaf62b 100644
--- a/Localization/sr-latn-RS/OrchardCore.Menu.po
+++ b/Localization/sr-latn-RS/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Meniji"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Stavka menija uspešno izbrisana."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Izmeni {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Naziv"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Naziv"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/sr-latn-RS/OrchardCore.Microsoft.Authentication.po b/Localization/sr-latn-RS/OrchardCore.Microsoft.Authentication.po
index 8587b6e59a390..d64250c3a2c26 100644
--- a/Localization/sr-latn-RS/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/sr-latn-RS/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sr-latn-RS/OrchardCore.Navigation.po b/Localization/sr-latn-RS/OrchardCore.Navigation.po
index d79a278a95a93..9aaadbf25bc83 100644
--- a/Localization/sr-latn-RS/OrchardCore.Navigation.po
+++ b/Localization/sr-latn-RS/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Notifications.po b/Localization/sr-latn-RS/OrchardCore.Notifications.po
index 1533ef1fd92b3..be517071eaf2a 100644
--- a/Localization/sr-latn-RS/OrchardCore.Notifications.po
+++ b/Localization/sr-latn-RS/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -106,21 +106,21 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -146,15 +146,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -251,7 +251,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -260,13 +260,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -327,13 +327,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -345,7 +345,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -357,7 +357,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -381,10 +381,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -407,7 +407,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -419,7 +419,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -431,7 +431,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -455,37 +455,32 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/sr-latn-RS/OrchardCore.OpenId.po b/Localization/sr-latn-RS/OrchardCore.OpenId.po
index bc45f3c2e9cea..dc36bb5a01817 100644
--- a/Localization/sr-latn-RS/OrchardCore.OpenId.po
+++ b/Localization/sr-latn-RS/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/sr-latn-RS/OrchardCore.Placements.po b/Localization/sr-latn-RS/OrchardCore.Placements.po
index 6dafb7ffd5a36..aa24f0e27e8f6 100644
--- a/Localization/sr-latn-RS/OrchardCore.Placements.po
+++ b/Localization/sr-latn-RS/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/sr-latn-RS/OrchardCore.ProjectTemplates.po b/Localization/sr-latn-RS/OrchardCore.ProjectTemplates.po
index 13ac624cdc4e4..f2c89be5aa16d 100644
--- a/Localization/sr-latn-RS/OrchardCore.ProjectTemplates.po
+++ b/Localization/sr-latn-RS/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sr-latn-RS/OrchardCore.PublishLater.po b/Localization/sr-latn-RS/OrchardCore.PublishLater.po
index f2bb15520d169..a6a18200de6bc 100644
--- a/Localization/sr-latn-RS/OrchardCore.PublishLater.po
+++ b/Localization/sr-latn-RS/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2021-07-15 18:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sr-latn-RS/OrchardCore.Queries.po b/Localization/sr-latn-RS/OrchardCore.Queries.po
index bee302afca9f3..f86d08836ac15 100644
--- a/Localization/sr-latn-RS/OrchardCore.Queries.po
+++ b/Localization/sr-latn-RS/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Izvrši SQL upit"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Došlo je do greške prilikom izvršavanja SQL upita: {0}"
@@ -326,7 +326,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL upit"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -362,7 +362,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Tehnički naziv upita."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -466,7 +466,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -478,7 +478,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Kada je uključeno, rezultat upita mora da bude lista ID-jeva dokumenata."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/sr-latn-RS/OrchardCore.ReCaptcha.Core.po b/Localization/sr-latn-RS/OrchardCore.ReCaptcha.Core.po
index 2b0e0cd72f8ce..06f65a1fb2540 100644
--- a/Localization/sr-latn-RS/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/sr-latn-RS/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2021-07-15 19:00\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/sr-latn-RS/OrchardCore.ReCaptcha.po b/Localization/sr-latn-RS/OrchardCore.ReCaptcha.po
index 4d994335a9374..1e4c70d8d4dce 100644
--- a/Localization/sr-latn-RS/OrchardCore.ReCaptcha.po
+++ b/Localization/sr-latn-RS/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/sr-latn-RS/OrchardCore.Recipes.Core.po b/Localization/sr-latn-RS/OrchardCore.Recipes.Core.po
index bbcce264d9b50..a5e16ec00c299 100644
--- a/Localization/sr-latn-RS/OrchardCore.Recipes.Core.po
+++ b/Localization/sr-latn-RS/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/sr-latn-RS/OrchardCore.Roles.po b/Localization/sr-latn-RS/OrchardCore.Roles.po
index c7589487a2775..d7a39d60e1bc1 100644
--- a/Localization/sr-latn-RS/OrchardCore.Roles.po
+++ b/Localization/sr-latn-RS/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/OrchardCore.Rules.po b/Localization/sr-latn-RS/OrchardCore.Rules.po
index be0bb8e1cef7c..7fc3144ceb02e 100644
--- a/Localization/sr-latn-RS/OrchardCore.Rules.po
+++ b/Localization/sr-latn-RS/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/sr-latn-RS/OrchardCore.Search.Elasticsearch.po b/Localization/sr-latn-RS/OrchardCore.Search.Elasticsearch.po
index 725ac90cfe0e4..1b0cb8efc7685 100644
--- a/Localization/sr-latn-RS/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/sr-latn-RS/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -812,7 +848,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -854,7 +890,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -866,7 +902,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -884,7 +920,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/sr-latn-RS/OrchardCore.Search.Lucene.po b/Localization/sr-latn-RS/OrchardCore.Search.Lucene.po
index 43f140d10f4c3..8d629f55dc127 100644
--- a/Localization/sr-latn-RS/OrchardCore.Search.Lucene.po
+++ b/Localization/sr-latn-RS/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -522,13 +522,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -570,13 +570,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -618,13 +618,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -648,7 +648,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -672,7 +672,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -690,7 +690,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -714,7 +714,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -816,7 +816,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -834,7 +834,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -865,7 +865,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Search.po b/Localization/sr-latn-RS/OrchardCore.Search.po
index ae62c078fc871..64416fa09762c 100644
--- a/Localization/sr-latn-RS/OrchardCore.Search.po
+++ b/Localization/sr-latn-RS/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/sr-latn-RS/OrchardCore.Security.po b/Localization/sr-latn-RS/OrchardCore.Security.po
index a5f86f9d9ffcc..3fec51e09c21a 100644
--- a/Localization/sr-latn-RS/OrchardCore.Security.po
+++ b/Localization/sr-latn-RS/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-06-01 18:43\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/sr-latn-RS/OrchardCore.Seo.po b/Localization/sr-latn-RS/OrchardCore.Seo.po
index 72dde692dfac9..d25895083dd96 100644
--- a/Localization/sr-latn-RS/OrchardCore.Seo.po
+++ b/Localization/sr-latn-RS/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-15 20:32\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/sr-latn-RS/OrchardCore.Settings.po b/Localization/sr-latn-RS/OrchardCore.Settings.po
index a5af82c6b5660..914a6702ea4de 100644
--- a/Localization/sr-latn-RS/OrchardCore.Settings.po
+++ b/Localization/sr-latn-RS/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/sr-latn-RS/OrchardCore.Setup.Core.po b/Localization/sr-latn-RS/OrchardCore.Setup.Core.po
index 662206c0ca2c5..d1702175129b8 100644
--- a/Localization/sr-latn-RS/OrchardCore.Setup.Core.po
+++ b/Localization/sr-latn-RS/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/sr-latn-RS/OrchardCore.Setup.po b/Localization/sr-latn-RS/OrchardCore.Setup.po
index e77af109d4af5..85cb786a8e953 100644
--- a/Localization/sr-latn-RS/OrchardCore.Setup.po
+++ b/Localization/sr-latn-RS/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Šifra mora da sadrži najmanje {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Nije moguće da se podesi sajt bez recepta."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Ovo se koristi kao podrazumevani naslov vaših stranica."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Recepti Vam omogućavaju da instalirate sajt sa unapred unetim dodatnim opcijama, mogućnostima i podešavanjima."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Određuje podrazumevanu vremensku zonu koja se koristi pri prikazivanju i uređivanju datuma i vremena."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/sr-latn-RS/OrchardCore.Shortcodes.po b/Localization/sr-latn-RS/OrchardCore.Shortcodes.po
index 4f49d826b4ac9..cf1ff5edd0104 100644
--- a/Localization/sr-latn-RS/OrchardCore.Shortcodes.po
+++ b/Localization/sr-latn-RS/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/sr-latn-RS/OrchardCore.Sitemaps.po b/Localization/sr-latn-RS/OrchardCore.Sitemaps.po
index f10ed638a0a54..5fc1cfb59912b 100644
--- a/Localization/sr-latn-RS/OrchardCore.Sitemaps.po
+++ b/Localization/sr-latn-RS/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1024,7 +1024,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1036,7 +1036,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/sr-latn-RS/OrchardCore.Sms.po b/Localization/sr-latn-RS/OrchardCore.Sms.po
index 33f32874f8e81..2b88e648bacfe 100644
--- a/Localization/sr-latn-RS/OrchardCore.Sms.po
+++ b/Localization/sr-latn-RS/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/sr-latn-RS/OrchardCore.Spatial.po b/Localization/sr-latn-RS/OrchardCore.Spatial.po
index e65d1139131b2..a75885b078d0b 100644
--- a/Localization/sr-latn-RS/OrchardCore.Spatial.po
+++ b/Localization/sr-latn-RS/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sr-latn-RS/OrchardCore.Taxonomies.po b/Localization/sr-latn-RS/OrchardCore.Taxonomies.po
index b39cfbe698ba6..048408907dfaf 100644
--- a/Localization/sr-latn-RS/OrchardCore.Taxonomies.po
+++ b/Localization/sr-latn-RS/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Templates.Cms.Module.po b/Localization/sr-latn-RS/OrchardCore.Templates.Cms.Module.po
index cf5e691f42729..1811b3e0b9440 100644
--- a/Localization/sr-latn-RS/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/sr-latn-RS/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sr-latn-RS/OrchardCore.Templates.po b/Localization/sr-latn-RS/OrchardCore.Templates.po
index 8dac2b617031f..b7b3e1947b8c9 100644
--- a/Localization/sr-latn-RS/OrchardCore.Templates.po
+++ b/Localization/sr-latn-RS/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/sr-latn-RS/OrchardCore.Tenants.po b/Localization/sr-latn-RS/OrchardCore.Tenants.po
index 28097feacc280..b2352f3a695eb 100644
--- a/Localization/sr-latn-RS/OrchardCore.Tenants.po
+++ b/Localization/sr-latn-RS/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1230,8 +1224,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1248,7 +1242,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1260,49 +1254,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1320,7 +1314,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/sr-latn-RS/OrchardCore.Tests.po b/Localization/sr-latn-RS/OrchardCore.Tests.po
index 7b6aabe23bd06..aa7037dc1088b 100644
--- a/Localization/sr-latn-RS/OrchardCore.Tests.po
+++ b/Localization/sr-latn-RS/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/sr-latn-RS/OrchardCore.Themes.po b/Localization/sr-latn-RS/OrchardCore.Themes.po
index e6566a21876f8..44f425b158199 100644
--- a/Localization/sr-latn-RS/OrchardCore.Themes.po
+++ b/Localization/sr-latn-RS/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/OrchardCore.Title.po b/Localization/sr-latn-RS/OrchardCore.Title.po
index 4905feeb649af..e43c71da43f43 100644
--- a/Localization/sr-latn-RS/OrchardCore.Title.po
+++ b/Localization/sr-latn-RS/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sr-latn-RS/OrchardCore.Twitter.po b/Localization/sr-latn-RS/OrchardCore.Twitter.po
index b4163149d67b9..8942549453132 100644
--- a/Localization/sr-latn-RS/OrchardCore.Twitter.po
+++ b/Localization/sr-latn-RS/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/sr-latn-RS/OrchardCore.Users.Core.po b/Localization/sr-latn-RS/OrchardCore.Users.Core.po
index 201eaf94b4e31..15aa44cf3f739 100644
--- a/Localization/sr-latn-RS/OrchardCore.Users.Core.po
+++ b/Localization/sr-latn-RS/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-mail adresa '{0}' je neispravna."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Neočekivana greška: '{0}'."
diff --git a/Localization/sr-latn-RS/OrchardCore.Users.po b/Localization/sr-latn-RS/OrchardCore.Users.po
index 350eb9ff0e1d7..c70a55f17c714 100644
--- a/Localization/sr-latn-RS/OrchardCore.Users.po
+++ b/Localization/sr-latn-RS/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Korisnik uspešno kreiran"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Lokalno prijavljivanje nije dozvoljeno."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Neispravan pokušaj prijavljivanja."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Sajt ne dozvoljava registraciju korisnika."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Potvrdite vaš nalog"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Datom korisniku nije dozvoljeno prijavljivanje."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Morate da potvrdite vašu e-mail adresu."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Naziv"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "E-mail"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Odobri"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Aktiviraj"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Deaktiviraj"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Izbriši"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Korisnik {0} uspešno odobren."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Korisnik {0} uspešno izbrisan."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Korisnik {0} uspešno deaktiviran."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Korisnik {0} uspešno aktiviran."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Lozinka uspešno ažurirana."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Podešavanja za prijavljivanje"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Izvozi podešavanja za prijavljivanje."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Podešavanja promene e-mail adrese"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Izvozi podešavanja promene e-mail adrese."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Podešavanja registracije"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Izvozi podešavanja registracije."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Podešavanja resetovanja lozinke"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Izvozi podešavanja resetovanja lozinke."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "Rola {1} korisniku {0}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Korisnik koji će biti dodeljen. Podržava Liquid sintaksu."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Kreiraj korisnika"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Promeni lozinku"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Nova lozinka"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Promeni e-mail adresu"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Pošalji e-mail za potvrdu"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Naslov poruke. Podržava Liquid sintaksu."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Korisnik deaktiviran."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3354,7 +3426,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3420,7 +3492,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3444,16 +3516,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/sr-latn-RS/OrchardCore.Widgets.po b/Localization/sr-latn-RS/OrchardCore.Widgets.po
index 6e303173f7965..9a4845ca257b4 100644
--- a/Localization/sr-latn-RS/OrchardCore.Widgets.po
+++ b/Localization/sr-latn-RS/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/sr-latn-RS/OrchardCore.Workflows.po b/Localization/sr-latn-RS/OrchardCore.Workflows.po
index b7c50f8ef3ab0..ccbeb3e8233d6 100644
--- a/Localization/sr-latn-RS/OrchardCore.Workflows.po
+++ b/Localization/sr-latn-RS/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1708,40 +1772,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1842,14 +1920,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1883,7 +1958,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1913,7 +1988,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1925,7 +2000,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1973,7 +2048,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1985,7 +2060,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2015,7 +2090,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2027,7 +2102,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2057,7 +2132,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2069,7 +2144,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2099,7 +2174,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2111,7 +2186,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2147,7 +2222,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2183,7 +2258,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2237,7 +2312,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2249,7 +2324,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2285,7 +2360,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2309,3 +2384,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/TheAdmin.po b/Localization/sr-latn-RS/TheAdmin.po
index beac24f118b86..d63583c01060e 100644
--- a/Localization/sr-latn-RS/TheAdmin.po
+++ b/Localization/sr-latn-RS/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Izbriši"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sr-latn-RS/TheAgencyTheme.po b/Localization/sr-latn-RS/TheAgencyTheme.po
index bd0d00f568d22..2a02d5a30e8c6 100644
--- a/Localization/sr-latn-RS/TheAgencyTheme.po
+++ b/Localization/sr-latn-RS/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-17 17:11\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sr-latn-RS/TheBlogTheme.po b/Localization/sr-latn-RS/TheBlogTheme.po
index 929a109c959e7..98fbe26828dcd 100644
--- a/Localization/sr-latn-RS/TheBlogTheme.po
+++ b/Localization/sr-latn-RS/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-02-18 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "{0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Nema rezultata za zadate pojmove."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Strana nije pronađena"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sr-latn-RS/TheTheme.po b/Localization/sr-latn-RS/TheTheme.po
index bc0ca4adcedc1..dbbd7d3945a9e 100644
--- a/Localization/sr-latn-RS/TheTheme.po
+++ b/Localization/sr-latn-RS/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Serbian Latin\n"
 "Language: sr_latn_RS\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,54 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/sv/OrchardCore.Admin.po b/Localization/sv/OrchardCore.Admin.po
index 23c4f0935866e..8d472418e8f36 100644
--- a/Localization/sv/OrchardCore.Admin.po
+++ b/Localization/sv/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:05\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr ""
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Bläddra gärna igenom menyn och upptäck alla dess möjligheter."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
+msgid "Enable theme toggler"
 msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr ""
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/sv/OrchardCore.AdminDashboard.po b/Localization/sv/OrchardCore.AdminDashboard.po
index ee67b1c7e11c5..e7e2326829158 100644
--- a/Localization/sv/OrchardCore.AdminDashboard.po
+++ b/Localization/sv/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr ""
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr ""
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr ""
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/sv/OrchardCore.AdminMenu.po b/Localization/sv/OrchardCore.AdminMenu.po
index 924b34f4b4662..efd9c030da14f 100644
--- a/Localization/sv/OrchardCore.AdminMenu.po
+++ b/Localization/sv/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Skapa admin-meny {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Namn"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Skapa nod"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Redigera administratörsmenyn: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Namn"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Redigera nod"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Prioriteringen av denna länk som ska visas som aktiv istället för en annan när båda pekar på samma url. Länken med det högsta värdet har aktiv status i navigeringen."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Positionsordningen för denna länk i administratörsmenyn."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Länk"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Länktexten som den kommer att visas i trädet."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Url:en för länken. En länk kommer endast att visas om den eller en av dess barn har en Url. Url:en kommer att vara relativ roten av admin-siten"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Välj en ikon"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Platshållare"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Texten för meny-objektet som den kommer att visas i trädet."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Välj"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Välj en ikon att visa när detta meny-objekt är på första nivå."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Välj en ikon"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Alias.po b/Localization/sv/OrchardCore.Alias.po
index 58eba719e5bac..4731a1983d75f 100644
--- a/Localization/sv/OrchardCore.Alias.po
+++ b/Localization/sv/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mönstret innehåller inte ett giltigt Liquid-uttryck. Detaljer: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Lämna tomt för att regenerera det."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Alias har skapats och inmatningen är inaktiverad"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sv/OrchardCore.ArchiveLater.po b/Localization/sv/OrchardCore.ArchiveLater.po
index 3c10eca62b91e..ab2df3aac215b 100644
--- a/Localization/sv/OrchardCore.ArchiveLater.po
+++ b/Localization/sv/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sv/OrchardCore.AuditTrail.po b/Localization/sv/OrchardCore.AuditTrail.po
index 96cc698dcd3ac..083b03b97ae81 100644
--- a/Localization/sv/OrchardCore.AuditTrail.po
+++ b/Localization/sv/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-10 11:58\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/sv/OrchardCore.Autoroute.po b/Localization/sv/OrchardCore.Autoroute.po
index 4542bf1a89d0e..0161d2a59eafc 100644
--- a/Localization/sv/OrchardCore.Autoroute.po
+++ b/Localization/sv/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Markera för att inaktivera autoroute för detta innehållsobjekt."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Markera för att ange att ett underordnat innehållsobjekt kommer att dirigeras till en absolut sökväg."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sv/OrchardCore.BackgroundTasks.po b/Localization/sv/OrchardCore.BackgroundTasks.po
index 87d3f6363e0cd..a26bdf5bb6ab9 100644
--- a/Localization/sv/OrchardCore.BackgroundTasks.po
+++ b/Localization/sv/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/sv/OrchardCore.ContentFields.po b/Localization/sv/OrchardCore.ContentFields.po
index 0544bf88fc0b4..28cd0e74849d9 100644
--- a/Localization/sv/OrchardCore.ContentFields.po
+++ b/Localization/sv/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Växla"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten att visa för detta fält i editorn."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Inga innehållsobjekt."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Ej publicerad"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Skriv för att söka"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Välj"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Ta bort"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Inget resultat hittades"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Huruvida tillåta att flera element väljs."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Visa alla innehållstyper"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Innehållstyperna att visa. Välj minst en."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten att visa för detta fält i editorn."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Lokaliserad"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Huruvida ett värde krävs."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten att visa för detta fält i editorn."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Huruvida ett värde krävs."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg-editor"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Dokumentation för alternativ"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "URL"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Länktext"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Huruvida URL:en är obligatorisk."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Använd URL:en för länken"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Tipstexten att visa för URL:en i editorn."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Tipstexten att visa för länktexten i editorn."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Ett tips (platshållare) att visa när indata för URL:en är tom."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Ett tips (platshållare) att visa när indata för texten är tom."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "En giltig URL föreslagen när innehållsobjektet skapas."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Inga innehållsobjekt."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Ej publicerad"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Skriv för att söka"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Välj"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Ta bort"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Inga resultat hittades"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Om du vill tillåta att flera element väljs."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Innehållstyperna att visa. Välj minst en."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Intervall"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Inga"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Huruvida ett värde krävs."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten att visa för detta fält i editorn."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Ett tips att visa när indata är tom. (valfri)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Antalet siffror efter decimaltecknet."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Det minsta tillåtna värdet. (valfritt)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Det största tillåtna värdet. (valfritt)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "URL"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Redigera data"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "En JSON-representation av tillåtna värden, t.ex. {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Huruvida ett värde krävs."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten att visa för detta fält i editorn."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Huruvida ett värde krävs."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Obligatorisk"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Huruvida ett värde krävs."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Tips"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten att visa för detta fält i editorn."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Bredd"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Bredden på video-lådan"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Höjd"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Höjden på video-lådan"
diff --git a/Localization/sv/OrchardCore.ContentLocalization.po b/Localization/sv/OrchardCore.ContentLocalization.po
index 377bdf508ca4c..9cebc64cdc1ae 100644
--- a/Localization/sv/OrchardCore.ContentLocalization.po
+++ b/Localization/sv/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/sv/OrchardCore.ContentPreview.po b/Localization/sv/OrchardCore.ContentPreview.po
index c60e14dd328dd..4ce52467278bf 100644
--- a/Localization/sv/OrchardCore.ContentPreview.po
+++ b/Localization/sv/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mönstret innehåller inte ett giltigt Liquid-uttryck. Detaljer: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Förhandsgranska"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Förhandsgranskning frånkopplad"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Fel vid förhandsgranskning"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sv/OrchardCore.ContentTypes.po b/Localization/sv/OrchardCore.ContentTypes.po
index 09057f406c8a8..787280fd128f7 100644
--- a/Localization/sv/OrchardCore.ContentTypes.po
+++ b/Localization/sv/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Innehållsdelar"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Visningsnamnet kan inte vara tomt."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "En typ med samma visningsnamn finns redan."
@@ -66,10 +66,10 @@ msgstr "En typ med samma visningsnamn finns redan."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Det tekniska namnet kan inte vara tomt."
@@ -78,10 +78,10 @@ msgstr "Det tekniska namnet kan inte vara tomt."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Det tekniska namnet måste börja med en bokstav."
@@ -90,10 +90,10 @@ msgstr "Det tekniska namnet måste börja med en bokstav."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Det tekniska namnet innehåller ogiltiga tecken."
@@ -101,133 +101,133 @@ msgstr "Det tekniska namnet innehåller ogiltiga tecken."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "En typ med samma tekniska namn finns redan."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "\"{0}\"-innehållstypen har skapats."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\"-inställningar har sparats."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" har raderats."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "\"{0}\"-delen har lagts till."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "En del med samma visningsnamn finns redan."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "En del med samma tekniska namn finns redan."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "\"{0}\"-delen har raderats."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Innehållsdelen kunde inte skapas."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "\"{0}\"-innehållsdelen har skapats."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Inställningarna för \"{0}\" har sparats."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Ett fält med samma visningsnamn finns redan."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Ett fält med samma tekniska namn finns redan."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Fältet \"{0}\" har lagts till."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Visningsnamn ändrat till {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "\"{0}\"-fältegenskaperna har sparats."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "\"{0}\"-fältet har raderats."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "\"{0}\"-delegenskaperna har sparats."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Innehållstyp-namnet kan inte vara tomt."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Kan inte lägga till del med namn '{0}'. Den finns redan."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Lägg till nytt fält till \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Namnet på fältet så som det visas på skärmar."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Lägg till namngiven del till \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Namn för den återanvändbara delen som det visas på skärmar."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Tekniskt namn på den återanvändbara delen."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Namn för delen som det visas på skärmar. Lämna tomt för att använda standardvärden."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Kryssa i för att tillåta denna del att kopplas flera gånger."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Namn på typen som det visas på skärmar."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Ny innehållstyp"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Namn på typen som det visas på skärmar."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Ny innehållsdel"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Skapa"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Redigera innehållstyp - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Fält"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Redigera"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Ta bort"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Lägg till fält"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Delar"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Innehåller fälten för den aktuella typen"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Lägg till delar"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Lägg till namngiven del"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Spara"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Ta bort"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" inställningar för \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Namnet på fältet så som det visas på skärmar."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Tekniskt namn på fältet."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Vilken typ av editor ska användas?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Vilken typ av visningsläge ska användas?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Spara"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Några delinställningar delade för alla typer kan också definieras på <a href=\"{0}\">Deldefinition</a>-nivå."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Namn på delen så som det visas på skärmar."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Beskrivning på delen så som den visas på skärmar."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Vilken typ av editor ska användas?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Vilken typ av visningsläge ska användas?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Spara"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Avbryt"
diff --git a/Localization/sv/OrchardCore.Contents.po b/Localization/sv/OrchardCore.Contents.po
index 38787b28fb305..c2db48faa4216 100644
--- a/Localization/sv/OrchardCore.Contents.po
+++ b/Localization/sv/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "Den {0} har avpublicerats."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Alla innehållstyper"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Innehåll"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Klar"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Datumet då innehållsobjektet först skapades eller publicerades."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "och fortsätt"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Någon innehållstyp"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Någon innehållstyp"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Innehåll"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Någon innehållstyp"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Visa alla innehållstyper"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Välj en ikon"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Visa alla innehållstyper"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Någon innehållstyp"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Någon innehållstyp"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Någon innehållstyp"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Skapa innehåll"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Kryssa i om du vill att innehållsobjektet ska publiceras när det skapas. Lämna okryssad för att skapa en utkast-version."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Ta bort innehåll genom att använda uttryck: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Innehåll"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Ny"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Publicera innehåll genom att använda uttryck: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Avpublicera innehåll genom att använda uttryck: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/sv/OrchardCore.CustomSettings.po b/Localization/sv/OrchardCore.CustomSettings.po
index 8bb0ce4552e5d..29f6626d757f0 100644
--- a/Localization/sv/OrchardCore.CustomSettings.po
+++ b/Localization/sv/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Anpassade inställningar"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alla"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/sv/OrchardCore.Data.YesSql.po b/Localization/sv/OrchardCore.Data.YesSql.po
index 60719518e883c..323a930ac708b 100644
--- a/Localization/sv/OrchardCore.Data.YesSql.po
+++ b/Localization/sv/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Demo.po b/Localization/sv/OrchardCore.Demo.po
index f7cf6167ccffd..a942e500e4677 100644
--- a/Localization/sv/OrchardCore.Demo.po
+++ b/Localization/sv/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Förnamn"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Efternamn"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/sv/OrchardCore.Deployment.Remote.po b/Localization/sv/OrchardCore.Deployment.Remote.po
index a6eda7c0088ed..89102e36aab09 100644
--- a/Localization/sv/OrchardCore.Deployment.Remote.po
+++ b/Localization/sv/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Skickar utrullningsplanen till en fjärrinstans."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Klientnamn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Skapa fjärrinstans"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Klientnamn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Redigera fjärrklient"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Klientnamn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Redigera fjärrinstans"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "URL"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Klientnamn"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/sv/OrchardCore.Deployment.po b/Localization/sv/OrchardCore.Deployment.po
index 8992b64b843d6..c21cc2863461f 100644
--- a/Localization/sv/OrchardCore.Deployment.po
+++ b/Localization/sv/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Radera"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Namnet är obligatoriskt."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Skapa utrullningsplan"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Den egna filen att lägga till som del av planen."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Filnamnet som det kommer att läggas till i arkivet."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Utrullningsplaner"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Alla"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Redigera utrullningsplan"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Receptfilen att lägga till som en del av planen."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Receptets namn."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Namnet på receptet."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Receptbeskrivningen."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Receptets författare."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Receptet webbplats."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Receptversionen."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Receptkategorierna (kommaseparerade värden)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/sv/OrchardCore.Diagnostics.po b/Localization/sv/OrchardCore.Diagnostics.po
index 34cc9adcfdfba..4d219decf046e 100644
--- a/Localization/sv/OrchardCore.Diagnostics.po
+++ b/Localization/sv/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Din webbläsare skickade en begäran som servern inte kunde förstå."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Ett fel inträffade vid körningen av denna begäran."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Du har inte tillgång till denna resurs."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Sidan kunde inte hittas."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Du har inte behörighet att se detta innehåll."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/sv/OrchardCore.Email.Abstractions.po b/Localization/sv/OrchardCore.Email.Abstractions.po
index dafec083bc27c..24f388f94f674 100644
--- a/Localization/sv/OrchardCore.Email.Abstractions.po
+++ b/Localization/sv/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2022-03-05 10:52\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Fältet {0} är obligatoriskt."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Leveranssättet '{0}' stöds inte."
diff --git a/Localization/sv/OrchardCore.Email.po b/Localization/sv/OrchardCore.Email.po
index ec89dde373dd5..9b9c3e937fb41 100644
--- a/Localization/sv/OrchardCore.Email.po
+++ b/Localization/sv/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/sv/OrchardCore.Facebook.po b/Localization/sv/OrchardCore.Facebook.po
index 0677dc41f4390..a88df4e51ba1c 100644
--- a/Localization/sv/OrchardCore.Facebook.po
+++ b/Localization/sv/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/sv/OrchardCore.Features.po b/Localization/sv/OrchardCore.Features.po
index 7fb3edcf42a6b..4fab8e6473901 100644
--- a/Localization/sv/OrchardCore.Features.po
+++ b/Localization/sv/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Funktioner"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Välj en eller flera funktioner."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Flows.po b/Localization/sv/OrchardCore.Flows.po
index 96d44bc98d547..bb47fc450befb 100644
--- a/Localization/sv/OrchardCore.Flows.po
+++ b/Localization/sv/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/sv/OrchardCore.Forms.po b/Localization/sv/OrchardCore.Forms.po
index 425e6a0bb29b1..f15cd0f92abb6 100644
--- a/Localization/sv/OrchardCore.Forms.po
+++ b/Localization/sv/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/sv/OrchardCore.GitHub.po b/Localization/sv/OrchardCore.GitHub.po
index 7658ce401611d..64970aa8f1314 100644
--- a/Localization/sv/OrchardCore.GitHub.po
+++ b/Localization/sv/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sv/OrchardCore.Google.po b/Localization/sv/OrchardCore.Google.po
index 0e7bd62767ee5..db11faed18ca6 100644
--- a/Localization/sv/OrchardCore.Google.po
+++ b/Localization/sv/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/sv/OrchardCore.Html.po b/Localization/sv/OrchardCore.Html.po
index c9555247414e9..f8683d36f7153 100644
--- a/Localization/sv/OrchardCore.Html.po
+++ b/Localization/sv/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Https.po b/Localization/sv/OrchardCore.Https.po
index 23fdb1db959e6..1b004b0d8c8b3 100644
--- a/Localization/sv/OrchardCore.Https.po
+++ b/Localization/sv/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-17 16:45\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/sv/OrchardCore.Infrastructure.Abstractions.po b/Localization/sv/OrchardCore.Infrastructure.Abstractions.po
index 28b986dd679af..854e6bc235aa1 100644
--- a/Localization/sv/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/sv/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2022-03-05 10:52\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/sv/OrchardCore.Layers.po b/Localization/sv/OrchardCore.Layers.po
index b0e3b722394b3..0d7e1745dca3c 100644
--- a/Localization/sv/OrchardCore.Layers.po
+++ b/Localization/sv/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Skapa lager"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Beskrivning"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Redigera lager - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Redigera widgetar och lager"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget har flyttats. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Ångra</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Zoner"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "<a href=\"{0}\">Definiera tillgängliga zoner</a> innan du lägger till widgetar"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Lägg till Widget"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Lager"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Välj ett lager för att visa tillhörande widgetar."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Redigera"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Radera"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "<a href=\"{0}\">Skapa ett lager</a> innan du lägger till widgetar"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Lägg till"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Om markerad, kommer titeln att renderas med widgeten."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Lagret widgeten ska associeras med."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/sv/OrchardCore.Liquid.po b/Localization/sv/OrchardCore.Liquid.po
index 4c7aa40adde51..d29aa64ab3bfa 100644
--- a/Localization/sv/OrchardCore.Liquid.po
+++ b/Localization/sv/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/sv/OrchardCore.Lists.po b/Localization/sv/OrchardCore.Lists.po
index 8459b02414278..7c3e1770d2483 100644
--- a/Localization/sv/OrchardCore.Lists.po
+++ b/Localization/sv/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/sv/OrchardCore.Localization.po b/Localization/sv/OrchardCore.Localization.po
index 4aa918b4186ab..6fa74ff2d5fa2 100644
--- a/Localization/sv/OrchardCore.Localization.po
+++ b/Localization/sv/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Kulturer"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "En kultur krävs"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "De aktiva kulturerna som har konfigurerats för webbplatsen."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Lägg till kultur"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/sv/OrchardCore.Markdown.po b/Localization/sv/OrchardCore.Markdown.po
index 0b2366b8d5901..5c372779cd2c4 100644
--- a/Localization/sv/OrchardCore.Markdown.po
+++ b/Localization/sv/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Innehållets innehåll i Markdown-format."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sv/OrchardCore.Media.po b/Localization/sv/OrchardCore.Media.po
index 18b6e02b846ef..84a41d4083f78 100644
--- a/Localization/sv/OrchardCore.Media.po
+++ b/Localization/sv/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sv/OrchardCore.Menu.po b/Localization/sv/OrchardCore.Menu.po
index 9f0fa9f5f7350..3128f4fc10979 100644
--- a/Localization/sv/OrchardCore.Menu.po
+++ b/Localization/sv/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menyer"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Redigera {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/sv/OrchardCore.Microsoft.Authentication.po b/Localization/sv/OrchardCore.Microsoft.Authentication.po
index 02c0e89bc83ec..433e7fcdeb991 100644
--- a/Localization/sv/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/sv/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/sv/OrchardCore.Navigation.po b/Localization/sv/OrchardCore.Navigation.po
index ae57f5565c85c..b5a40ea630af8 100644
--- a/Localization/sv/OrchardCore.Navigation.po
+++ b/Localization/sv/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Notifications.po b/Localization/sv/OrchardCore.Notifications.po
index a2081172d8ac4..239bac282d7d5 100644
--- a/Localization/sv/OrchardCore.Notifications.po
+++ b/Localization/sv/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/sv/OrchardCore.OpenId.po b/Localization/sv/OrchardCore.OpenId.po
index c85619c938bfe..a1f2ef99fff45 100644
--- a/Localization/sv/OrchardCore.OpenId.po
+++ b/Localization/sv/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/sv/OrchardCore.Placements.po b/Localization/sv/OrchardCore.Placements.po
index d4d4b5c0715f2..2bd89a979a7d1 100644
--- a/Localization/sv/OrchardCore.Placements.po
+++ b/Localization/sv/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/sv/OrchardCore.ProjectTemplates.po b/Localization/sv/OrchardCore.ProjectTemplates.po
index 24f171ae05002..2989eeadd1fb3 100644
--- a/Localization/sv/OrchardCore.ProjectTemplates.po
+++ b/Localization/sv/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Visa"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sv/OrchardCore.PublishLater.po b/Localization/sv/OrchardCore.PublishLater.po
index e4f66f0310c77..b6d25e013b012 100644
--- a/Localization/sv/OrchardCore.PublishLater.po
+++ b/Localization/sv/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Publicera senare"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Avbryt senare publicering"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/sv/OrchardCore.Queries.po b/Localization/sv/OrchardCore.Queries.po
index e89fcf2cf7996..1eb9911a05f0f 100644
--- a/Localization/sv/OrchardCore.Queries.po
+++ b/Localization/sv/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/sv/OrchardCore.ReCaptcha.Core.po b/Localization/sv/OrchardCore.ReCaptcha.Core.po
index 2f647d329feee..a284851b0bb4c 100644
--- a/Localization/sv/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/sv/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/sv/OrchardCore.ReCaptcha.po b/Localization/sv/OrchardCore.ReCaptcha.po
index aca2edacf7e97..d1b89c4156687 100644
--- a/Localization/sv/OrchardCore.ReCaptcha.po
+++ b/Localization/sv/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/sv/OrchardCore.Recipes.Core.po b/Localization/sv/OrchardCore.Recipes.Core.po
index 0eb5efd1ad939..8f2d3a40547b5 100644
--- a/Localization/sv/OrchardCore.Recipes.Core.po
+++ b/Localization/sv/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/sv/OrchardCore.Roles.po b/Localization/sv/OrchardCore.Roles.po
index 61b52718d2e74..8ef8eb9aaf66e 100644
--- a/Localization/sv/OrchardCore.Roles.po
+++ b/Localization/sv/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Roller"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Ogiltigt rollnamn."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rollen har uppdaterats."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Kan inte ta bort systemroller."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Skapa roll"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Rollnamn"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Redigera rolldetaljer"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Behörighet"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Denna behörighet kan tillåta en användare att höja sina andra behörigheter. Bevilja det med extrem eftertänksamhet."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Avbryt"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/sv/OrchardCore.Rules.po b/Localization/sv/OrchardCore.Rules.po
index 37d4f20afc158..08a5f813e0456 100644
--- a/Localization/sv/OrchardCore.Rules.po
+++ b/Localization/sv/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/sv/OrchardCore.Search.Elasticsearch.po b/Localization/sv/OrchardCore.Search.Elasticsearch.po
index 1544b54b590aa..b6e9cdf4566c1 100644
--- a/Localization/sv/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/sv/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/sv/OrchardCore.Search.Lucene.po b/Localization/sv/OrchardCore.Search.Lucene.po
index 34fffb2bb3c5b..8729716008c4f 100644
--- a/Localization/sv/OrchardCore.Search.Lucene.po
+++ b/Localization/sv/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Search.po b/Localization/sv/OrchardCore.Search.po
index 8caa94d84ae6d..3193b649301c0 100644
--- a/Localization/sv/OrchardCore.Search.po
+++ b/Localization/sv/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/sv/OrchardCore.Security.po b/Localization/sv/OrchardCore.Security.po
index 555b00884a32c..d83abfffdaebf 100644
--- a/Localization/sv/OrchardCore.Security.po
+++ b/Localization/sv/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/sv/OrchardCore.Seo.po b/Localization/sv/OrchardCore.Seo.po
index 59d345d911518..fc70c4e82ceb0 100644
--- a/Localization/sv/OrchardCore.Seo.po
+++ b/Localization/sv/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/sv/OrchardCore.Settings.po b/Localization/sv/OrchardCore.Settings.po
index 284ee997f3a1d..120351772d1a8 100644
--- a/Localization/sv/OrchardCore.Settings.po
+++ b/Localization/sv/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/sv/OrchardCore.Setup.Core.po b/Localization/sv/OrchardCore.Setup.Core.po
index 30918faa4abb6..4401ec0a882cf 100644
--- a/Localization/sv/OrchardCore.Setup.Core.po
+++ b/Localization/sv/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/sv/OrchardCore.Setup.po b/Localization/sv/OrchardCore.Setup.po
index 86c0a216b955e..bffd1a8fd85a2 100644
--- a/Localization/sv/OrchardCore.Setup.po
+++ b/Localization/sv/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Lösenordet måste minst innehålla {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Det går inte att installera en webbplats utan recept."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Detta används som standardtitel på dina sidor."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Recept låter dig konfigurera din webbplats med ytterligare förkonfigurerade alternativ, funktioner och inställningar från start."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Bestämmer tidszon som används som standard vid visning och redigering av datum och tider."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Visa/dölj anslutningssträng"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Superanvändaren har alla rättigheter. Den bör endast användas under installation och för katastrofåterställning."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Användarnamn"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "E-postadressen är ogiltig."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Lösenordsstyrka"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/sv/OrchardCore.Shortcodes.po b/Localization/sv/OrchardCore.Shortcodes.po
index 15a59b4ee63f5..d401b0dd5fc2a 100644
--- a/Localization/sv/OrchardCore.Shortcodes.po
+++ b/Localization/sv/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/sv/OrchardCore.Sitemaps.po b/Localization/sv/OrchardCore.Sitemaps.po
index 4bb8f5a11905b..32236a887aa3a 100644
--- a/Localization/sv/OrchardCore.Sitemaps.po
+++ b/Localization/sv/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Webbplatsinställningen 'Bas url' är tom, men krävs för att generera webbplatskartor."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Webbplatsinställningen 'Bas url' är tom, men krävs för att generera webbplatskartor."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Avmarkera för att inaktivera routing till webbplatskartans index."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Webbplatsinställningen 'Bas url' är tom, men krävs för att generera webbplatskartor."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Webbplatsinställningen 'Bas url' är tom, men krävs för att generera webbplatskartor."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Namn"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Avmarkera för att inaktivera routing till webbplatskartans index."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Markera för att utesluta detta innehållsobjekt från webbplatskartan."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Den frekvens detta innehållsobjekt sannolikt kommer att ändras med."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/sv/OrchardCore.Sms.po b/Localization/sv/OrchardCore.Sms.po
index 5c30d6272921f..51199a161fcde 100644
--- a/Localization/sv/OrchardCore.Sms.po
+++ b/Localization/sv/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/sv/OrchardCore.Spatial.po b/Localization/sv/OrchardCore.Spatial.po
index 453279331d220..d116d25b28da1 100644
--- a/Localization/sv/OrchardCore.Spatial.po
+++ b/Localization/sv/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/sv/OrchardCore.Taxonomies.po b/Localization/sv/OrchardCore.Taxonomies.po
index e51a5d299dcc8..7dbd9ed27b310 100644
--- a/Localization/sv/OrchardCore.Taxonomies.po
+++ b/Localization/sv/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Ett värde krävs för '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Taggar"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Det gick inte att hitta taxonomin. Kontrollera inställningarna för det här fältet."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Fel vid skapande av tagg"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Skriv för att söka"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Välj"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Ta bort"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Tryck på enter för att skapa en tagg"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Inga taggar hittades"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Taggar"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Det gick inte att hitta taxonomin. Kontrollera inställningarna för det här fältet."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Tipstexten som ska visas för detta fält på redigeraren."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taxonomi"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Krävs"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Om minst ett element är valt."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Unik"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Om bara ett element kan väljas."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Endast nedersta nivån"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Om det enbart går att välja element på den nedersta nivån."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Om nya taggar kan skapas inline. Notera: När du skapar taggar inline kommer endast visningstext att anges."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Innehållstyp"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Lägg till {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Du har sorterat om taxonomin."
diff --git a/Localization/sv/OrchardCore.Templates.Cms.Module.po b/Localization/sv/OrchardCore.Templates.Cms.Module.po
index 79849fae59fb0..5cd1e168763cb 100644
--- a/Localization/sv/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/sv/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Visa"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/sv/OrchardCore.Templates.po b/Localization/sv/OrchardCore.Templates.po
index 1b130bdb20832..ac33d6848a371 100644
--- a/Localization/sv/OrchardCore.Templates.po
+++ b/Localization/sv/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Namnet på mallen."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Beskrivningen av mallen."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Namnet på mallen."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Beskrivningen av mallen."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/sv/OrchardCore.Tenants.po b/Localization/sv/OrchardCore.Tenants.po
index ac4b07d20920f..3ebd63e221cb1 100644
--- a/Localization/sv/OrchardCore.Tenants.po
+++ b/Localization/sv/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Instanser"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Alla status"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Kör"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Inaktiverad"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Ej initierad"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Namn"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Status"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Inaktivera"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Aktivera"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Du kan inte inaktivera standardinstansen."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Instansen '{0}' är redan inaktiverad."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Instansen '{0}' är redan aktiverad."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Du kan bara aktivera en inaktiverad instans."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Instansen hittades inte: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Det går inte att installera in instansen."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Databasleverantören är inte definierad."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Anslutningssträngen krävs för denna databasanslutning."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Antingen \"recept\" eller \"receptnamn\" krävs."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Receptet '{0}' hittades inte."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Skapa instans"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Ny uppgift"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Välj namnet på instansen att skapa."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Valfritt) beskrivning av instansen att skapa."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Exempel: Om värden är \"orchardproject.net\", är webbplatsens URL \"http://orchardproject.net/\"."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Vilken typ av databas ska användas?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tabellprefix"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Anslutningssträng"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Recept"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Inaktivera instans"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Redigera instans"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Aktivera instans"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Aktivera en instans."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Installera instans"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Välj namnet på instansen att skapa."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Webbplatsens namn"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Administratörens användarnamn"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Administratörens e-postadress"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Administratörslösenord"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Vilken typ av databas ska användas?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tabellprefix"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Anslutningssträng"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/sv/OrchardCore.Tests.po b/Localization/sv/OrchardCore.Tests.po
index 43c07995c0997..9003724220ad4 100644
--- a/Localization/sv/OrchardCore.Tests.po
+++ b/Localization/sv/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/sv/OrchardCore.Themes.po b/Localization/sv/OrchardCore.Themes.po
index f358e9c9a9fa0..936fc2ad68179 100644
--- a/Localization/sv/OrchardCore.Themes.po
+++ b/Localization/sv/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Exporterar valt tema för webb och administratörssidorna."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sv/OrchardCore.Title.po b/Localization/sv/OrchardCore.Title.po
index c0e8a05ef4d68..dc8de978d0e80 100644
--- a/Localization/sv/OrchardCore.Title.po
+++ b/Localization/sv/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mönstret innehåller inte ett giltigt Liquid-uttryck. Detaljer: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/sv/OrchardCore.Twitter.po b/Localization/sv/OrchardCore.Twitter.po
index d2ae06da04ec7..e9fe901938c9e 100644
--- a/Localization/sv/OrchardCore.Twitter.po
+++ b/Localization/sv/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/sv/OrchardCore.Users.Core.po b/Localization/sv/OrchardCore.Users.Core.po
index b6cf7e6bc95ab..4bc5f412e796a 100644
--- a/Localization/sv/OrchardCore.Users.Core.po
+++ b/Localization/sv/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "E-post '{0}' är ogiltig."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Oväntat fel: {0}."
diff --git a/Localization/sv/OrchardCore.Users.po b/Localization/sv/OrchardCore.Users.po
index 9f4b51278e07b..b2b58fe102b42 100644
--- a/Localization/sv/OrchardCore.Users.po
+++ b/Localization/sv/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,16 +3514,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/sv/OrchardCore.Widgets.po b/Localization/sv/OrchardCore.Widgets.po
index d053787c45a02..14067c72c69d8 100644
--- a/Localization/sv/OrchardCore.Widgets.po
+++ b/Localization/sv/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Lägg till Widget"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/sv/OrchardCore.Workflows.po b/Localization/sv/OrchardCore.Workflows.po
index 208aabfd514fd..c77dbbdcf1aa7 100644
--- a/Localization/sv/OrchardCore.Workflows.po
+++ b/Localization/sv/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/sv/TheAdmin.po b/Localization/sv/TheAdmin.po
index 6ab46114d9b39..7a0b718a53afd 100644
--- a/Localization/sv/TheAdmin.po
+++ b/Localization/sv/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Dölj / visa meny"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Radera"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Är du säker på att du vill ta bort det här elementet?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr ""
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/sv/TheAgencyTheme.po b/Localization/sv/TheAgencyTheme.po
index d9686bc3ed002..31187bf52cdb0 100644
--- a/Localization/sv/TheAgencyTheme.po
+++ b/Localization/sv/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Det gick inte att hitta sidan som du sökte."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sv/TheBlogTheme.po b/Localization/sv/TheBlogTheme.po
index 81625cb66c6dc..71eded7c560bf 100644
--- a/Localization/sv/TheBlogTheme.po
+++ b/Localization/sv/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "på {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Sidan hittades inte"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/sv/TheTheme.po b/Localization/sv/TheTheme.po
index 1dab66c408167..1352647226e49 100644
--- a/Localization/sv/TheTheme.po
+++ b/Localization/sv/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/th-TH/OrchardCore.Admin.po b/Localization/th-TH/OrchardCore.Admin.po
index a5a9738ac3ccc..c6c66a007b645 100644
--- a/Localization/th-TH/OrchardCore.Admin.po
+++ b/Localization/th-TH/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "ผู้ดูแลระบบ"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "การตั้งค่าผู้ดูแลระบบ"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "ส่งออกข้อมูลการตั้งค่าผู้ดูแลระบบ"
@@ -50,22 +50,22 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr ""
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "คุณสามารถเลือกเมนูและค้นหาสิ่งที่เกี่ยวข้องทั้งหมดได้"
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "เปิดโหมดกลางคืน สำหรับผู้ดูแลระบบ"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
+msgid "Whether or not to display a theme toggler."
 msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "ผู้ดูแลระบบ"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/th-TH/OrchardCore.AdminDashboard.po b/Localization/th-TH/OrchardCore.AdminDashboard.po
index 8d267c372e0c5..70417ae9e6ef1 100644
--- a/Localization/th-TH/OrchardCore.AdminDashboard.po
+++ b/Localization/th-TH/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "ไม่ใช่"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "ตำแหน่ง"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "ความกว้าง"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/th-TH/OrchardCore.AdminMenu.po b/Localization/th-TH/OrchardCore.AdminMenu.po
index 719acce6cc5b2..cfd9e63ea8cc4 100644
--- a/Localization/th-TH/OrchardCore.AdminMenu.po
+++ b/Localization/th-TH/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "ลิงค์"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "เลือกไอคอน"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr ""
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Alias.po b/Localization/th-TH/OrchardCore.Alias.po
index 24db669d36b2c..df86655cf3e5a 100644
--- a/Localization/th-TH/OrchardCore.Alias.po
+++ b/Localization/th-TH/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/th-TH/OrchardCore.ArchiveLater.po b/Localization/th-TH/OrchardCore.ArchiveLater.po
index df0fb637f5bad..2325c763175a0 100644
--- a/Localization/th-TH/OrchardCore.ArchiveLater.po
+++ b/Localization/th-TH/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-10-11 20:38\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/th-TH/OrchardCore.AuditTrail.po b/Localization/th-TH/OrchardCore.AuditTrail.po
index 47db4625cd1d5..828891b98a7e9 100644
--- a/Localization/th-TH/OrchardCore.AuditTrail.po
+++ b/Localization/th-TH/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "หมวดหมู่ทั้งหมด"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "ตั้งขอบเขตเวลา"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/th-TH/OrchardCore.Autoroute.po b/Localization/th-TH/OrchardCore.Autoroute.po
index bf743e899ae96..d8f1a17fd82aa 100644
--- a/Localization/th-TH/OrchardCore.Autoroute.po
+++ b/Localization/th-TH/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/th-TH/OrchardCore.BackgroundTasks.po b/Localization/th-TH/OrchardCore.BackgroundTasks.po
index 85d5379512252..90da7a1d87893 100644
--- a/Localization/th-TH/OrchardCore.BackgroundTasks.po
+++ b/Localization/th-TH/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-22 07:36\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/th-TH/OrchardCore.ContentFields.po b/Localization/th-TH/OrchardCore.ContentFields.po
index bdcc3aade38fa..05d748652cbe6 100644
--- a/Localization/th-TH/OrchardCore.ContentFields.po
+++ b/Localization/th-TH/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.ContentLocalization.po b/Localization/th-TH/OrchardCore.ContentLocalization.po
index 25319b451c5ad..3f7b3c39a7be9 100644
--- a/Localization/th-TH/OrchardCore.ContentLocalization.po
+++ b/Localization/th-TH/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/th-TH/OrchardCore.ContentPreview.po b/Localization/th-TH/OrchardCore.ContentPreview.po
index 652fc5a1d5a07..f79e410fc54c7 100644
--- a/Localization/th-TH/OrchardCore.ContentPreview.po
+++ b/Localization/th-TH/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr ""
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/th-TH/OrchardCore.ContentTypes.po b/Localization/th-TH/OrchardCore.ContentTypes.po
index f2204439da482..a0921d8842dc8 100644
--- a/Localization/th-TH/OrchardCore.ContentTypes.po
+++ b/Localization/th-TH/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-10 12:00\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr ""
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr ""
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Contents.po b/Localization/th-TH/OrchardCore.Contents.po
index 94c42d6cb6285..cd0c5df58d3ca 100644
--- a/Localization/th-TH/OrchardCore.Contents.po
+++ b/Localization/th-TH/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr ""
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr ""
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr ""
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr ""
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/th-TH/OrchardCore.CustomSettings.po b/Localization/th-TH/OrchardCore.CustomSettings.po
index d7cb93f10e726..566081e9b878f 100644
--- a/Localization/th-TH/OrchardCore.CustomSettings.po
+++ b/Localization/th-TH/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/th-TH/OrchardCore.Data.YesSql.po b/Localization/th-TH/OrchardCore.Data.YesSql.po
index 7619341d120f7..d3e021203ea8e 100644
--- a/Localization/th-TH/OrchardCore.Data.YesSql.po
+++ b/Localization/th-TH/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Demo.po b/Localization/th-TH/OrchardCore.Demo.po
index 19b2e701d8435..dc08ce32b2146 100644
--- a/Localization/th-TH/OrchardCore.Demo.po
+++ b/Localization/th-TH/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/th-TH/OrchardCore.Deployment.Remote.po b/Localization/th-TH/OrchardCore.Deployment.Remote.po
index 963a137655bfa..183d29037c0d4 100644
--- a/Localization/th-TH/OrchardCore.Deployment.Remote.po
+++ b/Localization/th-TH/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/th-TH/OrchardCore.Deployment.po b/Localization/th-TH/OrchardCore.Deployment.po
index 4a5c27c184814..182bc415e85c6 100644
--- a/Localization/th-TH/OrchardCore.Deployment.po
+++ b/Localization/th-TH/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/th-TH/OrchardCore.Diagnostics.po b/Localization/th-TH/OrchardCore.Diagnostics.po
index 10ae7a049bc60..443948fc6a8ec 100644
--- a/Localization/th-TH/OrchardCore.Diagnostics.po
+++ b/Localization/th-TH/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2021-08-01 16:37\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/th-TH/OrchardCore.Email.Abstractions.po b/Localization/th-TH/OrchardCore.Email.Abstractions.po
index bc5cc15af4fa3..f34e8e09b790c 100644
--- a/Localization/th-TH/OrchardCore.Email.Abstractions.po
+++ b/Localization/th-TH/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr ""
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Email.po b/Localization/th-TH/OrchardCore.Email.po
index ab0471029f055..9bbdb9c13715a 100644
--- a/Localization/th-TH/OrchardCore.Email.po
+++ b/Localization/th-TH/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr ""
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/th-TH/OrchardCore.Facebook.po b/Localization/th-TH/OrchardCore.Facebook.po
index 386f63506c2b7..b00982aa81354 100644
--- a/Localization/th-TH/OrchardCore.Facebook.po
+++ b/Localization/th-TH/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/th-TH/OrchardCore.Features.po b/Localization/th-TH/OrchardCore.Features.po
index 0653274d3838e..14f99eb446a0d 100644
--- a/Localization/th-TH/OrchardCore.Features.po
+++ b/Localization/th-TH/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr ""
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Flows.po b/Localization/th-TH/OrchardCore.Flows.po
index 96a0b678ba9d9..b3b6f4346386f 100644
--- a/Localization/th-TH/OrchardCore.Flows.po
+++ b/Localization/th-TH/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/th-TH/OrchardCore.Forms.po b/Localization/th-TH/OrchardCore.Forms.po
index 217dadab1c472..fd1fdc763391e 100644
--- a/Localization/th-TH/OrchardCore.Forms.po
+++ b/Localization/th-TH/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/th-TH/OrchardCore.GitHub.po b/Localization/th-TH/OrchardCore.GitHub.po
index 801974e224927..754149440dab7 100644
--- a/Localization/th-TH/OrchardCore.GitHub.po
+++ b/Localization/th-TH/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/th-TH/OrchardCore.Google.po b/Localization/th-TH/OrchardCore.Google.po
index 350e5afe59032..f9656dab378ac 100644
--- a/Localization/th-TH/OrchardCore.Google.po
+++ b/Localization/th-TH/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/th-TH/OrchardCore.Html.po b/Localization/th-TH/OrchardCore.Html.po
index 76bf48c1555b2..e43a402cb37fb 100644
--- a/Localization/th-TH/OrchardCore.Html.po
+++ b/Localization/th-TH/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Https.po b/Localization/th-TH/OrchardCore.Https.po
index 315d79df54e56..c15781fe6e85a 100644
--- a/Localization/th-TH/OrchardCore.Https.po
+++ b/Localization/th-TH/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-17 16:46\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/th-TH/OrchardCore.Infrastructure.Abstractions.po b/Localization/th-TH/OrchardCore.Infrastructure.Abstractions.po
index e28aef9077a2b..afc5d14afd234 100644
--- a/Localization/th-TH/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/th-TH/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/th-TH/OrchardCore.Layers.po b/Localization/th-TH/OrchardCore.Layers.po
index 3f674156a938c..5996ae5d8a1b4 100644
--- a/Localization/th-TH/OrchardCore.Layers.po
+++ b/Localization/th-TH/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/th-TH/OrchardCore.Liquid.po b/Localization/th-TH/OrchardCore.Liquid.po
index 5752cfe70c589..b7cb867f1b183 100644
--- a/Localization/th-TH/OrchardCore.Liquid.po
+++ b/Localization/th-TH/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/th-TH/OrchardCore.Lists.po b/Localization/th-TH/OrchardCore.Lists.po
index 55e2aabc65764..806931576afbc 100644
--- a/Localization/th-TH/OrchardCore.Lists.po
+++ b/Localization/th-TH/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/th-TH/OrchardCore.Localization.po b/Localization/th-TH/OrchardCore.Localization.po
index 15d21a6a8800f..4b002dc5d51bc 100644
--- a/Localization/th-TH/OrchardCore.Localization.po
+++ b/Localization/th-TH/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/th-TH/OrchardCore.Markdown.po b/Localization/th-TH/OrchardCore.Markdown.po
index d28d451d3e9a1..0f01c7b783ca1 100644
--- a/Localization/th-TH/OrchardCore.Markdown.po
+++ b/Localization/th-TH/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/th-TH/OrchardCore.Media.po b/Localization/th-TH/OrchardCore.Media.po
index d59ca1d78dec6..51a08b885f56e 100644
--- a/Localization/th-TH/OrchardCore.Media.po
+++ b/Localization/th-TH/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,43 +1083,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/th-TH/OrchardCore.Menu.po b/Localization/th-TH/OrchardCore.Menu.po
index a3cd3c5f26928..74247dd87adab 100644
--- a/Localization/th-TH/OrchardCore.Menu.po
+++ b/Localization/th-TH/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-17 16:52\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/th-TH/OrchardCore.Microsoft.Authentication.po b/Localization/th-TH/OrchardCore.Microsoft.Authentication.po
index 59c957877a94b..7a31b4f802f8b 100644
--- a/Localization/th-TH/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/th-TH/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/th-TH/OrchardCore.Navigation.po b/Localization/th-TH/OrchardCore.Navigation.po
index 953dc064ca194..1c61a8fab5bf9 100644
--- a/Localization/th-TH/OrchardCore.Navigation.po
+++ b/Localization/th-TH/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Notifications.po b/Localization/th-TH/OrchardCore.Notifications.po
index 7ee74733ca937..ab8de2007f030 100644
--- a/Localization/th-TH/OrchardCore.Notifications.po
+++ b/Localization/th-TH/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,10 +375,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/th-TH/OrchardCore.OpenId.po b/Localization/th-TH/OrchardCore.OpenId.po
index a33053c5c42bf..7818a7d1f029b 100644
--- a/Localization/th-TH/OrchardCore.OpenId.po
+++ b/Localization/th-TH/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/th-TH/OrchardCore.Placements.po b/Localization/th-TH/OrchardCore.Placements.po
index 9d03410bcefe2..b04d37ea0ae2f 100644
--- a/Localization/th-TH/OrchardCore.Placements.po
+++ b/Localization/th-TH/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/th-TH/OrchardCore.ProjectTemplates.po b/Localization/th-TH/OrchardCore.ProjectTemplates.po
index 4cbd6b005f33f..6b078de1d9107 100644
--- a/Localization/th-TH/OrchardCore.ProjectTemplates.po
+++ b/Localization/th-TH/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-05-05 19:07\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/th-TH/OrchardCore.PublishLater.po b/Localization/th-TH/OrchardCore.PublishLater.po
index ebb2ff4637749..e3822969b1912 100644
--- a/Localization/th-TH/OrchardCore.PublishLater.po
+++ b/Localization/th-TH/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2021-08-01 16:37\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/th-TH/OrchardCore.Queries.po b/Localization/th-TH/OrchardCore.Queries.po
index dc43f55d29069..e35397933e28d 100644
--- a/Localization/th-TH/OrchardCore.Queries.po
+++ b/Localization/th-TH/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/th-TH/OrchardCore.ReCaptcha.Core.po b/Localization/th-TH/OrchardCore.ReCaptcha.Core.po
index 32cd1edc400b2..bb56c7866cb22 100644
--- a/Localization/th-TH/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/th-TH/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2021-08-01 16:37\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/th-TH/OrchardCore.ReCaptcha.po b/Localization/th-TH/OrchardCore.ReCaptcha.po
index 4a5ab7d6ef20a..630daf373158e 100644
--- a/Localization/th-TH/OrchardCore.ReCaptcha.po
+++ b/Localization/th-TH/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/th-TH/OrchardCore.Recipes.Core.po b/Localization/th-TH/OrchardCore.Recipes.Core.po
index 6bf861a07833f..c55cc9280bdf4 100644
--- a/Localization/th-TH/OrchardCore.Recipes.Core.po
+++ b/Localization/th-TH/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-10-11 20:40\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/th-TH/OrchardCore.Roles.po b/Localization/th-TH/OrchardCore.Roles.po
index e792fa9848902..39d2715fb8ba9 100644
--- a/Localization/th-TH/OrchardCore.Roles.po
+++ b/Localization/th-TH/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/th-TH/OrchardCore.Rules.po b/Localization/th-TH/OrchardCore.Rules.po
index 42d0923fefa1a..c210b362d805f 100644
--- a/Localization/th-TH/OrchardCore.Rules.po
+++ b/Localization/th-TH/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/th-TH/OrchardCore.Search.Elasticsearch.po b/Localization/th-TH/OrchardCore.Search.Elasticsearch.po
index 118374f35e0f3..775c1e72431c3 100644
--- a/Localization/th-TH/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/th-TH/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/th-TH/OrchardCore.Search.Lucene.po b/Localization/th-TH/OrchardCore.Search.Lucene.po
index 246d856e34ddc..0b3c29291b4c1 100644
--- a/Localization/th-TH/OrchardCore.Search.Lucene.po
+++ b/Localization/th-TH/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Search.po b/Localization/th-TH/OrchardCore.Search.po
index 38d0117180852..831d01988387e 100644
--- a/Localization/th-TH/OrchardCore.Search.po
+++ b/Localization/th-TH/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/th-TH/OrchardCore.Security.po b/Localization/th-TH/OrchardCore.Security.po
index c8383d47d69be..1f2bb33ce62dd 100644
--- a/Localization/th-TH/OrchardCore.Security.po
+++ b/Localization/th-TH/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-06-01 18:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/th-TH/OrchardCore.Seo.po b/Localization/th-TH/OrchardCore.Seo.po
index f81b34f44eb1d..f67e8dccff008 100644
--- a/Localization/th-TH/OrchardCore.Seo.po
+++ b/Localization/th-TH/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/th-TH/OrchardCore.Settings.po b/Localization/th-TH/OrchardCore.Settings.po
index 4adcc6658bd7b..fcf8b0d97a11d 100644
--- a/Localization/th-TH/OrchardCore.Settings.po
+++ b/Localization/th-TH/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/th-TH/OrchardCore.Setup.Core.po b/Localization/th-TH/OrchardCore.Setup.Core.po
index f3da9e7a87f82..3ba091412a2e8 100644
--- a/Localization/th-TH/OrchardCore.Setup.Core.po
+++ b/Localization/th-TH/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/th-TH/OrchardCore.Setup.po b/Localization/th-TH/OrchardCore.Setup.po
index 0ba8179e8f775..b63879e877899 100644
--- a/Localization/th-TH/OrchardCore.Setup.po
+++ b/Localization/th-TH/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr ""
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr ""
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/th-TH/OrchardCore.Shortcodes.po b/Localization/th-TH/OrchardCore.Shortcodes.po
index 257bb714dc88b..19e0de6989783 100644
--- a/Localization/th-TH/OrchardCore.Shortcodes.po
+++ b/Localization/th-TH/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/th-TH/OrchardCore.Sitemaps.po b/Localization/th-TH/OrchardCore.Sitemaps.po
index e668f91e52ebf..6e5cf6c11055b 100644
--- a/Localization/th-TH/OrchardCore.Sitemaps.po
+++ b/Localization/th-TH/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/th-TH/OrchardCore.Sms.po b/Localization/th-TH/OrchardCore.Sms.po
index 1cbe0cdfd7bcd..74d3838989922 100644
--- a/Localization/th-TH/OrchardCore.Sms.po
+++ b/Localization/th-TH/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/th-TH/OrchardCore.Spatial.po b/Localization/th-TH/OrchardCore.Spatial.po
index acb28b0185501..df0e0b0d6fed2 100644
--- a/Localization/th-TH/OrchardCore.Spatial.po
+++ b/Localization/th-TH/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/th-TH/OrchardCore.Taxonomies.po b/Localization/th-TH/OrchardCore.Taxonomies.po
index b01666662b065..8da732d96c7da 100644
--- a/Localization/th-TH/OrchardCore.Taxonomies.po
+++ b/Localization/th-TH/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr ""
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr ""
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Templates.Cms.Module.po b/Localization/th-TH/OrchardCore.Templates.Cms.Module.po
index c6c4d7f8034cb..2b0b9f72ab715 100644
--- a/Localization/th-TH/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/th-TH/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2022-05-05 19:16\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/th-TH/OrchardCore.Templates.po b/Localization/th-TH/OrchardCore.Templates.po
index b47b9b2ea9cb9..90d930c19e34c 100644
--- a/Localization/th-TH/OrchardCore.Templates.po
+++ b/Localization/th-TH/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/th-TH/OrchardCore.Tenants.po b/Localization/th-TH/OrchardCore.Tenants.po
index e5df8cc5202bf..7ff1b068f0af9 100644
--- a/Localization/th-TH/OrchardCore.Tenants.po
+++ b/Localization/th-TH/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr ""
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr ""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr ""
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr ""
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
 msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr ""
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr ""
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/th-TH/OrchardCore.Tests.po b/Localization/th-TH/OrchardCore.Tests.po
index e14d2638d7386..f1036494d3586 100644
--- a/Localization/th-TH/OrchardCore.Tests.po
+++ b/Localization/th-TH/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Themes.po b/Localization/th-TH/OrchardCore.Themes.po
index b010003b9bd6c..cd915250b74d2 100644
--- a/Localization/th-TH/OrchardCore.Themes.po
+++ b/Localization/th-TH/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/th-TH/OrchardCore.Title.po b/Localization/th-TH/OrchardCore.Title.po
index 4b101956d4304..b8678937f152e 100644
--- a/Localization/th-TH/OrchardCore.Title.po
+++ b/Localization/th-TH/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/th-TH/OrchardCore.Twitter.po b/Localization/th-TH/OrchardCore.Twitter.po
index 5efccee73bce3..ea7c8aa02664b 100644
--- a/Localization/th-TH/OrchardCore.Twitter.po
+++ b/Localization/th-TH/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/th-TH/OrchardCore.Users.Core.po b/Localization/th-TH/OrchardCore.Users.Core.po
index 166e817b7ac29..60a414f792f41 100644
--- a/Localization/th-TH/OrchardCore.Users.Core.po
+++ b/Localization/th-TH/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr ""
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr ""
diff --git a/Localization/th-TH/OrchardCore.Users.po b/Localization/th-TH/OrchardCore.Users.po
index a320b5df5af7d..4b7e5a70d46fe 100644
--- a/Localization/th-TH/OrchardCore.Users.po
+++ b/Localization/th-TH/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr ""
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "ยืนยันบัญชีของคุณ"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "ผู้ใช้ทั้งหมด"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "ผู้ใช้ที่อนุญาติให้ใช้งาน"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "ผู้ใช้ที่ไม่อนุญาติให้ใช้งาน"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "ชื่อ"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "อีเมล"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "อนุมัติ"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "เปิดใช้งาน"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "ปิดใช้งาน"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "ลบ"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "การตั้งค่าการเปลี่ยนอีเมล"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "ส่งออกข้อมูลการตั้งค่าการเปลี่ยนอีเมล"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "การตั้งค่าการลงทะเบียน"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "ส่งออกข้อมูลการตั้งค่าการลงทะเบียน"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "การตั้งค่าในการตั้งรหัสผ่านใหม่"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "ส่งออกข้อมูล การตั้งค่าในการตั้งรหัสผ่านใหม่"
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr ""
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr ""
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr ""
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "กรุณาตรวจสอบอีเมลเพื่อทำการรีเซ็ตรหัสผ่าน"
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr ""
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "อีเมล"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr ""
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3416,7 +3488,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3440,16 +3512,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/th-TH/OrchardCore.Widgets.po b/Localization/th-TH/OrchardCore.Widgets.po
index 7dd0613a7941d..fcd3dd9b8726f 100644
--- a/Localization/th-TH/OrchardCore.Widgets.po
+++ b/Localization/th-TH/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/th-TH/OrchardCore.Workflows.po b/Localization/th-TH/OrchardCore.Workflows.po
index 054541311ad96..ce5e87dc238f9 100644
--- a/Localization/th-TH/OrchardCore.Workflows.po
+++ b/Localization/th-TH/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr ""
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr ""
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr ""
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr ""
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr ""
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr ""
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr ""
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr ""
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr ""
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr ""
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr ""
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr ""
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1704,40 +1768,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr ""
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr ""
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1834,12 +1912,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1873,7 +1950,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1903,7 +1980,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr ""
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1915,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1963,7 +2040,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1975,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2005,7 +2082,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2017,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2047,7 +2124,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2059,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2089,7 +2166,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2101,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2137,7 +2214,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2173,7 +2250,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2227,7 +2304,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2239,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2275,7 +2352,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2299,3 +2376,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/th-TH/TheAdmin.po b/Localization/th-TH/TheAdmin.po
index e8eecea461993..4ad393e8d0f5a 100644
--- a/Localization/th-TH/TheAdmin.po
+++ b/Localization/th-TH/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "โหมดกลางวัน"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "โหมดกลางคืน"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "ย่อหรือขยายเมนู"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "ลบ"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "คุณแน่ใจที่จะลบข้อมูลส่วนนี้หรือไม่?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "ตกลง"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "ยกเลิก"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/th-TH/TheAgencyTheme.po b/Localization/th-TH/TheAgencyTheme.po
index 7e7d73d75b751..20e01bf0f1f49 100644
--- a/Localization/th-TH/TheAgencyTheme.po
+++ b/Localization/th-TH/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-18 20:37\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "ไม่พบผลลัพธ์"
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "ไม่พบหน้าที่ต้องการ"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "ไม่พบหน้าที่คุณต้องการ"
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/th-TH/TheBlogTheme.po b/Localization/th-TH/TheBlogTheme.po
index b03df928383ef..7142e8dc55d7c 100644
--- a/Localization/th-TH/TheBlogTheme.po
+++ b/Localization/th-TH/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-02-18 20:37\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr ""
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "ไม่พบหน้าที่ต้องการ"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/th-TH/TheTheme.po b/Localization/th-TH/TheTheme.po
index ed99550131133..f781c556c6b85 100644
--- a/Localization/th-TH/TheTheme.po
+++ b/Localization/th-TH/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/tr/OrchardCore.Admin.po b/Localization/tr/OrchardCore.Admin.po
index c381b58e3a1cc..55a0b3039178c 100644
--- a/Localization/tr/OrchardCore.Admin.po
+++ b/Localization/tr/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Yönetici"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Yönetici ayarları"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Yönetici ayarlarını dışarı aktarır."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Orchard Core'a hoş geldiniz"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Tüm özellikleri keşfetmek için soldaki menüyü kullanabilirsiniz."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Yönetici ekranında gece modunu etkinleştir"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Karanlık mod yönetici temasının görüntülenip görüntülenemeyeceği."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Başlığın üst barda görüntülenip görüntülenemeyeceği."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Yönetici"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/tr/OrchardCore.AdminDashboard.po b/Localization/tr/OrchardCore.AdminDashboard.po
index 1b66b29ba6702..7c3ca78980ae5 100644
--- a/Localization/tr/OrchardCore.AdminDashboard.po
+++ b/Localization/tr/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-13 16:53\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Hayır"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Konum"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Genişlik"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/tr/OrchardCore.AdminMenu.po b/Localization/tr/OrchardCore.AdminMenu.po
index bac56f01e6a9c..671a3993a1a14 100644
--- a/Localization/tr/OrchardCore.AdminMenu.po
+++ b/Localization/tr/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "{0} Yönetici Menüsünü Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "İsim"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Düğüm oluştur"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "{0} Yönetici Menüsünü Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Düğümü Düzenle"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Her ikisi de aynı Url’yi işaret ederken, bu bağlantının önceliği başka biri yerine etkin olarak gösterilecektir. En yüksek değerli bağlantı, navigasyondaki aktif duruma sahiptir."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Yönetici menüsündeki bu linkin pozisyon sırası."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Bağlantı"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Ağaçta gösterileceği şekliyle bağlantı metni."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Bağlantının Url'si. Bir bağlantı yalnızca veya çocuklarından birinin Url'si varsa gösterilecektir. Url, yönetici sitesinin köküne göre olacaktır"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Bir simge seç"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -571,7 +571,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Yertutucu"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -583,7 +583,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Ağaçta gösterileceği şekliyle menünün metni."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -596,49 +596,49 @@ msgid "Pick"
 msgstr "Seç"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Bu menü maddesi birinci seviyede olduğunda görüntülemek için bir simge seçin."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Bir simge seç"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Yetkiler"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Aranacak metni girin"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Seç"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Kaldır"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Sonuç bulunamadı"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Bu menü öğesini göstermek için gerekli yetkiler (isteğe bağlı)."
diff --git a/Localization/tr/OrchardCore.Alias.po b/Localization/tr/OrchardCore.Alias.po
index 634ff0808ffab..7e52ba747f7ce 100644
--- a/Localization/tr/OrchardCore.Alias.po
+++ b/Localization/tr/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "Takma ad zaten kullanımda \"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Desen geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Yeniden oluşturmak için boş bırakın."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Takma ad oluşturulur ve giriş devre dışı bırakılır"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/tr/OrchardCore.ArchiveLater.po b/Localization/tr/OrchardCore.ArchiveLater.po
index 1ef6280178040..094ac0be639c8 100644
--- a/Localization/tr/OrchardCore.ArchiveLater.po
+++ b/Localization/tr/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-03-02 10:14\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "Sonra Arşivle"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "Daha Sonra Arşivlemeyi İptal Et"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/tr/OrchardCore.AuditTrail.po b/Localization/tr/OrchardCore.AuditTrail.po
index d1f854a7a5691..a35ce0af78642 100644
--- a/Localization/tr/OrchardCore.AuditTrail.po
+++ b/Localization/tr/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Denetim İzi"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Tüm kategoriler"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Özel zaman aralığı"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -577,7 +577,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Denetim İzi"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -631,7 +631,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "Saklama özelliğinin devre dışı bırakıp bırakılmayacağı ayarı."
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -643,7 +643,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Bir etkinliğin tutulduğu gün sayısı."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/tr/OrchardCore.Autoroute.po b/Localization/tr/OrchardCore.Autoroute.po
index 6de94466fd26e..1f75e65b0b3c6 100644
--- a/Localization/tr/OrchardCore.Autoroute.po
+++ b/Localization/tr/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "Kalıcı link boyutu çok uzun. Kalıcı link sadece {0} karaktere kadar olabilir."
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "Bu içerik öğesi için otomatik rotayı devre dışı bırakmak için işaretleyin."
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "Bir alt içerik öğesinin mutlak bir yola yönlendirileceğini belirtmek için işaretleyin."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/tr/OrchardCore.BackgroundTasks.po b/Localization/tr/OrchardCore.BackgroundTasks.po
index beaf069c29216..e0c4611207e5b 100644
--- a/Localization/tr/OrchardCore.BackgroundTasks.po
+++ b/Localization/tr/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "Başlık"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "Açıklama"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Gelişmiş sekmesinde geçersiz kilit süre sonu değeri (invalid lock expiration value )"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "Etkin dağıtılmış kilit özelliği yoksa, yoksayılır."
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/tr/OrchardCore.ContentFields.po b/Localization/tr/OrchardCore.ContentFields.po
index 3ab7b59ebf7ac..e2a38b2d32b9d 100644
--- a/Localization/tr/OrchardCore.ContentFields.po
+++ b/Localization/tr/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Şalter"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "İçerik ögesi bulunmamaktadır."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Standart"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Yayınlanmadı"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Aramak için yaz"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Seç"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Kaldır"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Sonuç bulunamadı"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Birden fazla elemanın seçilmesine izin verilip verilmeyeceği."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Tüm İçerik Tiplerini Göster"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "Bu Stereotiplerin tüm içerik türleri"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Görüntülenecek içerik türleri. En az birini seçin."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Yerelleştirilmiş"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg editörü"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Editör seçeneklerine girin, dil kaydedildiğinde her zaman 'html' olarak ayarlanır."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Seçenekler dokümantasyonu"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "URL'nin Medya Ekle'den seçildiğinde kullanılıp kullanılmadığı (Varsayılan olarak Shortcode eklenmiştir)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Seçenekler için belgeler"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "Url"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Bağlantı metni"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Bağlantının Url'sini kullan"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Editörde bu Url için gösterilecek ipucu metni."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Editörde bu bağlantının metni için gösterilecek ipucu metni."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Url'nin girişi boş olduğunda görüntülenecek bir ipucu (yer tutucu)."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Url'nin girişi boş olduğunda görüntülenecek bir ipucu (yer tutucu)."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Bir içerik öğesi oluştururken önerilen varsayılan bağlantı metni."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "İçerik ögesi bulunmamaktadır."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Standart"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Yayınlanmadı"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Aranacak metni girin"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Seç"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Kaldır"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Sonuç bulunamadı"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Birden fazla elemanın seçilmesine izin verilip verilmeyeceği."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Görüntülenecek içerik türleri. En az birini seçin."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "Onay Kutusu Listesi"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Aranacak metni girin"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Seç"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Kaldır"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Değer bulunamadı"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ", "
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Veriyi Düzenle"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "İzin verilen değerlerin bir JSON gösterimi, ör {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Aralık"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Hiçbiri"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Çevirici"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Giriş boş olduğunda görüntülenecek bir ipucu. (isteğe bağlı)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Ondalık noktadan sonraki hane sayısı."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "İzin verilen minimum değer. (isteğe bağlı)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "İzin verilen maksimum değer. (isteğe bağlı)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "Url"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "H6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Editör seçeneklerini girin."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Seçenekler dokümantasyonu"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Veri Düzenle"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "İzin verilen değerlerin bir JSON gösterimi, ör {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "İptal"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr "Varsayılan değer. (isteğe bağlı)"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "Saniye için 60'ı tam bölen sayı kullanın örn: '15', milisaniye için değerin 1000'e bölünmüş ondalık halini kullanın örn: '0.250'."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Kullanıcı yok."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Standart"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Etkin değil"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Aranacak metni girin"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Seç"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Kaldır"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Sonuç bulunamadı"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Birden fazla elemanın seçilmesine izin verilip verilmeyeceği."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "Seçicinin(picker) tüm içerik türlerini görüntülemesine izin verilip verilmeyeceği."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Zorunlu"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "İpucu"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Editörde bu alan için gösterilecek ipucu metni."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Genişlik"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Video alanının genişliği"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Yükseklik"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Video alanının yüksekliği"
diff --git a/Localization/tr/OrchardCore.ContentLocalization.po b/Localization/tr/OrchardCore.ContentLocalization.po
index c9ddce2e20bbc..f183216369ffc 100644
--- a/Localization/tr/OrchardCore.ContentLocalization.po
+++ b/Localization/tr/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-13 18:45\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "İçerik öğesinin yerelleştirilmiş sürümü oluşturulamadı."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/tr/OrchardCore.ContentPreview.po b/Localization/tr/OrchardCore.ContentPreview.po
index 6c3603cb856fb..d8e43fe88041d 100644
--- a/Localization/tr/OrchardCore.ContentPreview.po
+++ b/Localization/tr/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Örüntü geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Önizleme"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Önizleme Bağlantısı Koptu"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Önizleme Hatası"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/tr/OrchardCore.ContentTypes.po b/Localization/tr/OrchardCore.ContentTypes.po
index e2abdd6ba924c..6ba57711a6702 100644
--- a/Localization/tr/OrchardCore.ContentTypes.po
+++ b/Localization/tr/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-14 10:08\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "İçerik Bileşenleri"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Görünen Ad boş olamaz."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Aynı Görünen Ada sahip bir tip zaten var."
@@ -66,10 +66,10 @@ msgstr "Aynı Görünen Ada sahip bir tip zaten var."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Teknik Adı boş olamaz."
@@ -78,10 +78,10 @@ msgstr "Teknik Adı boş olamaz."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Teknik ad bir harfle başlamak zorundadır."
@@ -90,10 +90,10 @@ msgstr "Teknik ad bir harfle başlamak zorundadır."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Teknik isim geçersiz karakterler içeriyor."
@@ -101,133 +101,133 @@ msgstr "Teknik isim geçersiz karakterler içeriyor."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "Teknik Ad, dahili kullanım için ayrılmıştır."
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Aynı Teknik Adı olan bir tür zaten var."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "\"{0}\" içerik tibi oluşturuldu."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\" ayarları kaydedildi."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "{0} silindi."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "\"{0}\" parçası eklendi."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Aynı Görünen Ad'a sahip bir parça zaten var."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Aynı Teknik Ada sahip bir parça zaten var."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "\"{0}\" parçası kaldırıldı."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "İçerik parçası oluşturulamadı."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "\"{0}\" içerik parçası oluşturuldu."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "\"{0}\" ayarları kaydedildi."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "Herhangi bir alan yok."
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Aynı Görünen Ada sahip bir alan zaten var."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Aynı Teknik Adı olan bir dosya zaten var."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "\"{0}\" alanı eklendi."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Görünen ad \"{0}\" olarak değiştirildi."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "\"{0}\" alan ayarları kaydedildi."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "\"{0}\" alanı kaldırıldı."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "\"{0}\" parça ayarları kaydedildi."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "İçerik Tip adı boş olamaz."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "\"{0}\" parçası eklenemez. Zaten var."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "\"{0}\" alanına yeni alan ekle"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Ekranda görünecek şekliyle alanın adı."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "\"{0}\" içine Adlandırılmış Parça ekle"
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Ekranda görüntüleneceği şekliyle yeniden kullanılabilir parçanın adı."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Yeniden kullanılabilir parçanın teknik adı."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "Belirtilen içerik türünü ve parça tanımlarını güncelleme için dışa aktarır."
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Alanın teknik adı."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Ekranda görüntüleneceği şekliyle parçanın adı. Varsayılanları kullanmak için boş bırakın."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Bu bölümün diğer birden fazla ilişkilendirilmesine izin vermek için işaretleyin."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "Türün teknik adı."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Ekranda görünecek şekliyle türün adı."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Yeni İçerik Türü"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Ekranda görünecek şekliyle türün adı."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Yeni İçerik Parçası"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Oluştur"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "Silinecek içerik türü tanımlarının virgülle ayrılmış listesi"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "Belirtilen içerik türünü ve parça tanımlarını silinmek üzere dışa aktarır."
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "\"{0}\" İçerik Türünü Düzenle"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Alanlar"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Düzenle"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Kaldır"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "Görüntüleme modu"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "Editör"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Alan Ekle"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Parçalar"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Geçerli türün alanlarını içerir"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Parçalar Ekle"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Adlandırılmış Parça Ekle"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Kaydet"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Sil"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" ayarları, \"{1}\" için"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Ekranda görünecek şekliyle alanın adı."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Alanın teknik adı."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Hangi tür liste editörü kullanılmalı?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Hangi tür görüntü modu kullanılmalı?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Kaydet"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "İptal"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Tüm türler için ortak olan bazı parça ayarları ayrıca <a href=\"{0}\"> Parça Tanımı </a> düzeyinde de tanımlanabilir."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Ekranda görünecek şekliyle parçanın adı."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Ekranda görünecek şekliyle parçanın açıklaması."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Hangi tür liste editörü kullanılmalı?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Hangi tür görüntü modu kullanılmalı?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Kaydet"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "İptal"
diff --git a/Localization/tr/OrchardCore.Contents.po b/Localization/tr/OrchardCore.Contents.po
index 813ceb0fc1515..969de65cf2cac 100644
--- a/Localization/tr/OrchardCore.Contents.po
+++ b/Localization/tr/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} yayından kaldırıldı."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Tüm içerik türleri"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "Bir veya daha fazla doğrulama hatası oluştu."
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "İçerik denetim ayarlarını dışa aktarır."
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "İçerik"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Bitti"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Denetim İzi"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "Düzenleme sırasında denetim izi (audit trail) yorumunun gösterilip gösterilmeyeceği."
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "İçerik ögesinin oluşturulduğu veya ilk yayınlandığı tarih."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "İçerik ögesinin sahibini düzenleyebilmek için işaretleyin. <code>EditContentOwner</code> izni de gerekli olacaktır."
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "ve Devam et"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Eylemler"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "İçerik"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "İçerik taslağı kaydedildi."
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "İçerik öğesi"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1735,7 +1735,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Tüm İçerik Tiplerini Göster"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1777,13 +1777,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Bir simge seç"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Tüm İçerik Tiplerini Göster"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1833,9 +1833,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Bu kaynaktan sağlanacak içerik öğelerinin miktarını sınırlayın. Not: Bu seçenek seçildiğinde yalnızca bir içerik türü seçilebilir."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1849,9 +1849,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "Bu içerik türlerinin değişme olasılığı bulunan varsayılan sıklık."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2027,7 +2027,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2063,7 +2063,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2099,7 +2099,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2135,7 +2135,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Herhangi bir içerik türü"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2171,7 +2171,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "İçerik Oluştur"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2195,7 +2195,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "İçerik öğesinin oluşturulurken yayınlanmasını isteyip istemediğinizi kontrol edin. Taslak versiyon oluşturmak için işaretlemeden bırakın."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2237,7 +2237,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "<em>{0}<em> ifadesini kullanarak içerik silin"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2285,37 +2285,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Taslağı JSON Olarak Görüntüle"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Taslağı JSON olarak indirin"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "JSON Olarak Yayınlananları Görüntüle"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "JSON Olarak Yayınlananları İndirin"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "JSON olarak görüntüle"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2345,7 +2345,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "İptal"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2435,7 +2435,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "Dağıtım hedef planlarına dışa aktarma içeriği bulunamadı. Bir dağıtım planı oluşturun ve buna bir dağıtım hedefine içeriği dışa aktar adımı ekleyin."
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2511,8 +2511,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "İçerik"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Yeni"
@@ -2535,7 +2535,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "<em>{0}<em> ifadesini kullanarak içeriği yayına alın"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2577,7 +2577,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Şu ifadeyi kullanarak içeriği alın: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2619,7 +2619,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "<em>{0}<em> ifadesini kullanarak içeriği yayından kaldırın"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2661,7 +2661,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "Şu ifadeyi kullanarak içeriği güncelleyin: <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2673,7 +2673,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "Güncellenecek İçerik Öğesinin Kimliğini (ContentItemId) değerlendiren bir JavaScript ifadesi girin. Örneğin: korelasyonId()."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/tr/OrchardCore.CustomSettings.po b/Localization/tr/OrchardCore.CustomSettings.po
index 0ae443f627a3e..8241f1a2f857f 100644
--- a/Localization/tr/OrchardCore.CustomSettings.po
+++ b/Localization/tr/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Kişisel ayarlar"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Hepsi"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/tr/OrchardCore.Data.YesSql.po b/Localization/tr/OrchardCore.Data.YesSql.po
index 4053b30d4b946..b92a6fcb8d3fc 100644
--- a/Localization/tr/OrchardCore.Data.YesSql.po
+++ b/Localization/tr/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-14 10:08\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "Tablolar silinemedi."
diff --git a/Localization/tr/OrchardCore.Demo.po b/Localization/tr/OrchardCore.Demo.po
index 654a61e0dc0c5..ca5a60b6134a3 100644
--- a/Localization/tr/OrchardCore.Demo.po
+++ b/Localization/tr/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-14 10:08\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr "MMMM dd, yyyy"
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Ad"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Soyad"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/tr/OrchardCore.Deployment.Remote.po b/Localization/tr/OrchardCore.Deployment.Remote.po
index a9d5a3b679f4a..7039cfacc4fd7 100644
--- a/Localization/tr/OrchardCore.Deployment.Remote.po
+++ b/Localization/tr/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Dağıtım planını uzaktaki bir örneğe gönderir."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "İstemci Adı"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Uzak Örnek Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "İstemci Adı"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Uzak İstemciyi Güncelle"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "İstemci Adı"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Uzaktan Örneği Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Ad"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "İstemci Adı"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/tr/OrchardCore.Deployment.po b/Localization/tr/OrchardCore.Deployment.po
index a9dd8f06730e0..bc7a6d50329a7 100644
--- a/Localization/tr/OrchardCore.Deployment.po
+++ b/Localization/tr/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON İçe Aktarma"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Sil"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Deployment planları başarıyla silindi."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Ad zorunludur."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Aynı ada sahip bir dağıtım planı zaten var."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Deployment planı başarıyla güncellendi."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Deployment plan adımı başarıyla silindi."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Deployment Planı Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Planın bir parçası olarak eklenecek özel dosya."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Arşive eklenmek üzere dosya adı."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Dağıtım Planları"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Deployment Planını Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -574,7 +574,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "JSON Tarifi"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "Planın bir parçası olarak eklenecek komut dosyası."
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -628,7 +628,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "Recipe adı."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "Recipein görünen adı."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -652,7 +652,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "Recipe açıklaması."
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -664,7 +664,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "Recipe Oluşturan."
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -676,7 +676,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "Recipe web sitesi."
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "Recipe web sitesi."
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -700,7 +700,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "Recipe kategorileri (virgülle ayrılmış değerler)."
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/tr/OrchardCore.Diagnostics.po b/Localization/tr/OrchardCore.Diagnostics.po
index 8c968940b7184..0231606ba00f8 100644
--- a/Localization/tr/OrchardCore.Diagnostics.po
+++ b/Localization/tr/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Tarayıcınız, sunucunun anlayamadığı bir istek gönderdi."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "İstek çalıştırılırken hata meydana geldi."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Bu kaynağa erişim izniniz yok."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Sayfa bulunamadı."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Bu içeriği görüntülemek için yetkiniz yok."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/tr/OrchardCore.Email.Abstractions.po b/Localization/tr/OrchardCore.Email.Abstractions.po
index 496b8842774bc..ada09f2fee142 100644
--- a/Localization/tr/OrchardCore.Email.Abstractions.po
+++ b/Localization/tr/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2022-03-05 10:53\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "{0} alanı zorunludur."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "{0} teslim metodu desteklenmiyor."
diff --git a/Localization/tr/OrchardCore.Email.po b/Localization/tr/OrchardCore.Email.po
index 15355fd2d1252..c0da8882ff5d3 100644
--- a/Localization/tr/OrchardCore.Email.po
+++ b/Localization/tr/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Hatalı E-posta."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "E-posta Görevi"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Mesajlaşma"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Başarısız"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "E-posta Gönder"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "E-postanın kimden geldiğini tanımlayan yazarın e-posta adresi. Yapılandırılan e-posta adresini kullanmak için boş bırakın. Liquid desteklenir."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Gönderenin e-posta adresi. Gelen e-posta adresiyle aynı değilse gereklidir. Liquid destekler."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "\"Yanıtla\" e-posta adresi. E-posta yanıtlarının Gelen adresinden farklı bir adrese gönderilmesini istiyorsanız gereklidir. Liquid destekler."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Alıcı e-posta adreslerinin virgülle ayrılmış listesi. Liquid desteği ile."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "Karbon kopya e-posta adreslerinin virgülle ayrılmış listesi. Liquid destekli."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "Gizli kopya e-posta adreslerinin virgülle ayrılmış listesi. Liquid destekler."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "E-posta mesajının gövdesinin HTML olarak gönderileceğini belirtir."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Ayarlar"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Alıcı"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Gönderici isteğe bağlıdır, e-posta yazarı e-postayı gönderenden farklı olduğunda kullanılabilir."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Gizli Kopya"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Bilgi"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Yanıtla"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Konu"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Gövde"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ayarlar kaydedildiğinde mevcut kiracı yeniden yüklenir."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Varsayılan e-posta adresi, e-posta göndereni ayarlanmadığı sürece gönderen olarak kullanılacak."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Ağ dağıtım seçenekleri"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "SMTP sunucusu alanı, örn. <İ> smtp.mailprovider.com </ i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "SMTP sunucusu bağlantı noktası, genellikle 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Proxy sunucuları opsiyonel."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "Proxy bağlantı noktası opsiyoneldir."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Bu seçenek belirlendiğinde, posta sunucusuyla kimlik doğrulaması yapmak için uygulama havuzu veya ana bilgisayar işlemi kimliği kullanılır."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Kimlik doğrulama için kullanıcı adı."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Belirtilen teslim alma dizini teslim seçenekleri"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Örneğin. <i> C: \\Yol\\Kime\\Bu\\Site\\PickedUpEmail </i>, e-postaları C sürücüsündeki <i> PickedUpEmail </i> dizinine yerleştirmek için."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/tr/OrchardCore.Facebook.po b/Localization/tr/OrchardCore.Facebook.po
index 3ca9427a93a10..22c9e391c2c2a 100644
--- a/Localization/tr/OrchardCore.Facebook.po
+++ b/Localization/tr/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Facebook gövdesi geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Gövde geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Oturum açma ayarları"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Kullanıcı-ajanının döneceği uygulamanın temel yolundaki istek yoludur. Ara katman bu istek ulaştığında işleme koyacaktır."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr "Giriş özelliğini kullanmak için <a href=\"{0}\">Meta Entegrasyon Ayarları</a> yapılandırılmalıdır"
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr "Meta Veri Kaynakları portalında bulunan Piksel Kimliği."
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Liquid formatdaki plugin'in template'i."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr "Meta Entegrasyonu"
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr "Meta geliştirici portalı parametrelerinde bulunan Uygulama Kimliği ID."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr "Meta geliştirici portalı parametrelerinde bulunan Uygulama gizli anahtarı."
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Javascript SDK Versiyonu"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "bütün sayfalardaki ilklendirme (init)"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/tr/OrchardCore.Features.po b/Localization/tr/OrchardCore.Features.po
index a59844fb75c8d..f24ff7c4e7160 100644
--- a/Localization/tr/OrchardCore.Features.po
+++ b/Localization/tr/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 15:55\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Özellikler"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Lütfen bir veya daha fazla özellik seçin."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "Bu özellik her zaman etkindir ve devre dışı bırakılamaz."
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0}, {1} idi."
@@ -125,9 +125,9 @@ msgstr "Toplu Eylemler"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Devre Dışı Bırak"
@@ -136,8 +136,8 @@ msgstr "Devre Dışı Bırak"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Etkinleştir"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Kategorilenmemiş"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "Bu özellik, bağımlılığa göre otomatik olarak etkinleştirilir ve manuel olarak devre dışı bırakılamaz."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "Bu özellik, bağımlılığa bağlı olarak otomatik olarak devre dışı bırakılır ve manuel olarak etkinleştirilemez."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "Bu özellik her zaman etkindir ve manuel olarak devre dışı bırakılamaz."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "{0} özelliğini devre dışı bırakmak, bağımlı şu özellikleri de devre dışı bırakacaktır: {1}. Devam Et?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Özelliği Devre Dışı Bırak"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Evet"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Hayır"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Bir şey bulunamadı!</strong> Arama sonucunda bir şey bulunamadı."
diff --git a/Localization/tr/OrchardCore.Flows.po b/Localization/tr/OrchardCore.Flows.po
index c009e39ab0c76..b302dc60ca7d6 100644
--- a/Localization/tr/OrchardCore.Flows.po
+++ b/Localization/tr/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-14 11:50\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr "{0} kimliğine sahip Widget içerik öğesinin eşleşen {1} içerik türü tanımı yok."
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Öğe Ekle"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Bu kısmın içerebileceği içerik türleri, ör. Slayt Gösterisi için Slayt."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr "Bu alanın içerebileceği içerik türlerinin Stereotipleri. Ayırıcı olarak virgül (,) kullanarak birden fazla Stereotip tanımlayabilirsiniz."
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Widget Ekle"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Sil"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Bu ögeyi kaldırmak istediğinizden emin misiniz?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "Widget bulunamadı."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/tr/OrchardCore.Forms.po b/Localization/tr/OrchardCore.Forms.po
index 8c8bc74ed4500..375b7156e5023 100644
--- a/Localization/tr/OrchardCore.Forms.po
+++ b/Localization/tr/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Seçenekler yanlış bir biçimde yazılmıştır."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Model Doğrulama Hatası Görevi Ekle"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Doğrulama"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Model Durumu Görevini Bağlama"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Doğrulama"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Antiforgery Token Görevini Doğrula"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Doğrulama"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Geçerli"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Geçersiz"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Form Alanı Görevini Doğrula"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Doğrulama"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Geçerli"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Geçersiz"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Form Görevini Doğrula"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Doğrulama"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Geçerli"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Geçersiz"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr "<em>{0}</em> = <em>{1}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Geçersiz bir değere sahip form alanının adı."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Gönderilen form alanlarını model durumuna bağlar."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Düğmede görüntülenecek metin."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Düğme türü."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr "Bu alan için oluşturulacak etiket türü."
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr "Etikette görüntülenecek metin."
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "Bu form öğesinde işlenecek kimlik."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr "Bu alan için oluşturulacak etiket türü."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Bu form öğesinde oluşturulacak ad."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "Formun gönderileceği URL."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Formu gönderirken kullanılacak HTTP yöntemi."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "Formda bir Sahtecilik Önleme Simgesi oluşturmak için işaretleyin."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Buton tipi."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Alanın değeri olmadığında görüntülenecek metin."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Bu alan için varsayılan değer."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Veri Düzenle"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "İzin verilen değerlerin bir JSON temsili, ör. {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr "Bu alan için kullanılacak editör stili."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Textarea'nın değeri olmadığında görüntülenecek metin."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "<em>{0}</em>'i doğrula"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Doğrulanacak form alanının adı."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Gönderilen formun herhangi bir doğrulama hatası içerip içermediğini kontrol eder."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/tr/OrchardCore.GitHub.po b/Localization/tr/OrchardCore.GitHub.po
index 1ab8cfb970f91..29575271e88a8 100644
--- a/Localization/tr/OrchardCore.GitHub.po
+++ b/Localization/tr/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "GitHub Kimlik Doğrulama Ayarları"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "<a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub Uygulamanızın</a> genel sekmesinde tanımlanan müşteri kimliği."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Uygulama gizliliği."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/tr/OrchardCore.Google.po b/Localization/tr/OrchardCore.Google.po
index 8c27884e87e10..dfb4f8bf330cf 100644
--- a/Localization/tr/OrchardCore.Google.po
+++ b/Localization/tr/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Google Analytics Ayarları"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Google Kimlik Doğrulama Ayarları"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Uygulama için Google API konsolunda tanımlanan istemci kimliği."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Uygulama için Google API konsolunda tanımlanan gizli anahtar."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr "Google Etiket Yöneticisi Ayarları"
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/tr/OrchardCore.Html.po b/Localization/tr/OrchardCore.Html.po
index a5d357d2ab0ba..536aaed2d48da 100644
--- a/Localization/tr/OrchardCore.Html.po
+++ b/Localization/tr/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg editörü"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "İçerik öğesinin gövdesi."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Editör seçeneklerine girin, dil kaydedildiğinde her zaman 'html' olarak ayarlanır."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Seçenekler için belgeler"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "Medya Ekle'den seçildiğinde url'nin kullanılıp kullanılmadığını gösterir (Varsayılan olarak Kısa Kod eklenir)."
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Editör seçeneklerini girin"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Seçenekler dokümantasyonu"
diff --git a/Localization/tr/OrchardCore.Https.po b/Localization/tr/OrchardCore.Https.po
index c69c902406d4f..9c37574d11cd9 100644
--- a/Localization/tr/OrchardCore.Https.po
+++ b/Localization/tr/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "HTTPS'ye yeniden yönlendirme yapılırken geçici bir yönlendirme (307 Bulundu) yerine kalıcı bir yönlendirmenin, \"308 Kalıcı Olarak Taşındı\"nın kullanılmasının gerekip gerekmediğini belirtir"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/tr/OrchardCore.Infrastructure.Abstractions.po b/Localization/tr/OrchardCore.Infrastructure.Abstractions.po
index e401a7b1dd813..0d3911d780610 100644
--- a/Localization/tr/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/tr/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2022-03-24 18:00\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "\"{0}\" switch'i bulunamadı"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "\"{0}\" özelliği var ama \"{1}\" ile dekore edilmemiş"
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "\"{2}\" anahtarı için \"{0}\" değeri \"{1}\" değerine dönüştürülürken hata oluştu"
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "\"{0}\" komut bağımsız değişkenleri komut tanımıyla eşleşmiyor"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "\"{0}\" yöntemi, \"{1}\" anahtarını desteklemiyor."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/tr/OrchardCore.Layers.po b/Localization/tr/OrchardCore.Layers.po
index 3644be7a13772..5bc4f19fbb2ba 100644
--- a/Localization/tr/OrchardCore.Layers.po
+++ b/Localization/tr/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:03\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Katman Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Açıklama"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "{0} Katmanını Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "Kural sırası güncellenirken hata oluştu"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Kaydet"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Widget'ları ve Katmanları Düzenle"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Widget başarıyla taşındı. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Geri Al</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Bölgeler"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Widget'ları eklemeden önce lütfen <a href=\"{0}\">mevcut bölgeleri tanımlayın</a>"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Widget ekle"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "Widget bulunamadı."
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "Katman bulunamadı."
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Katmanlar"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "İlişkili widget'leri görmek için bir katman seçin."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Dokümantasyonu gör"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Düzenle"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Sil"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Widget eklemeden önce lütfen <a href=\"{0}\">bir katman oluşturun</a>"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Ekle"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "İşaretliyse, başlık widget ile oluşturulacaktır."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Widget'in ilişkilendirilmesi gereken katman."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/tr/OrchardCore.Liquid.po b/Localization/tr/OrchardCore.Liquid.po
index 3970232a4fc43..ca604808bfff7 100644
--- a/Localization/tr/OrchardCore.Liquid.po
+++ b/Localization/tr/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Liquid gövdesi geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/tr/OrchardCore.Lists.po b/Localization/tr/OrchardCore.Lists.po
index 031afc4319a43..6b3798359143d 100644
--- a/Localization/tr/OrchardCore.Lists.po
+++ b/Localization/tr/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-14 10:08\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Üst içerik öğesine bir bağlantıyı ve içerik öğesinin temsil edildiği sırayı temsil eder."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "İçerik öğeleri koleksiyonunu temsil eder."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Belirtilen Blog Gönderisi artık mevcut değil. Lütfen yeni bir Blog Yazısı oluşturun."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Bu içeriği silme yetkiniz yok"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Sağlanan kullanıcı adı veya e-posta veya şifre yanlış."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Liste boş"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "RSS beslemesi bağlantı oluşturmayı devre dışı bırakın."
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "Geçerli özet akışı, <a href=\"{0}\" target=\"_blank\">{0}</a> adresinde mevcuttur."
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "Yeni"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Ögelerin manuel olarak sıralanmasını etkinleştirmek için bu seçeneği işaretleyin."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Listeler"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Üst menü öğesi ekle"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/tr/OrchardCore.Localization.po b/Localization/tr/OrchardCore.Localization.po
index 8595a1c25b271..4accb6c0dce6f 100644
--- a/Localization/tr/OrchardCore.Localization.po
+++ b/Localization/tr/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Kültürler"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Bir kültür gereklidir"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Ayarların geçerli olması için site yeniden başlatıldı."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Site için yapılandırılmış aktif kültürler."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Kültür Ayarları"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Kültür ayarlarını dışa aktarır."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Kültür ekle"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/tr/OrchardCore.Markdown.po b/Localization/tr/OrchardCore.Markdown.po
index f9ef896858874..1a2d13669be93 100644
--- a/Localization/tr/OrchardCore.Markdown.po
+++ b/Localization/tr/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg editörü"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "İçerik öğesinin gövdesi Markdown biçiminde."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg editörü"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/tr/OrchardCore.Media.po b/Localization/tr/OrchardCore.Media.po
index e391499af022e..3d12181d7b949 100644
--- a/Localization/tr/OrchardCore.Media.po
+++ b/Localization/tr/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Aynı ada sahip bir dosya zaten bulunduğundan medya taşınamıyor"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "Aynı ada sahip bir profil zaten var."
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "Medya profili başarıyla silindi."
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "Medya profilleri başarıyla kaldırıldı."
@@ -181,95 +181,95 @@ msgstr "Medya profilleri başarıyla kaldırıldı."
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Varsayılan"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Özel boyut"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "Varsayılan (Maks)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Maksimum"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Kırp"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "Pad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "BoxPad"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Minimum"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "Genişlet"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Dosya işletilirken bir hata oluştu."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Varlıkların yalnızca üst dizinden veya tüm alt dizinlerden alınıp alınmadığı."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "Medya Profili Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "Medya profili adı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "Medya profili için ipucu."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "İşlenen görüntü için genişliği seçin. Varsayılan değer, genişlik komutunun uygulanmayacağı anlamına gelir."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "İşlenen görüntünün yüksekliğini seçin. Varsayılan değer, yükseklik komutunun uygulanmayacağı anlamına gelir."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "İşlenen görüntü için yeniden boyutlandırma modunu seçin."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "İşlenen görüntü için arka plan rengini seçin. Boş bir değer, bir bgcolor komutunun uygulanmayacağı anlamına gelir. Geçerli değer örnekleri: 'beyaz', 'ffff00', 'ffff0080', '128,64,32' ve '128,64,32,80'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "İşlenen görüntü için formatı seçin. Varsayılan bir değer, bir format komutunun uygulanmayacağı anlamına gelir."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "Profil Özelliği Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "Medya profili adı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "Medya profili için ipucu."
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "İşlenen görüntü için genişliği seçin. Varsayılan değer, genişlik komutunun uygulanmayacağı anlamına gelir."
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "İşlenen görüntünün yüksekliğini seçin. Varsayılan değer, yükseklik komutunun uygulanmayacağı anlamına gelir."
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "İşlenen görüntü için yeniden boyutlandırma modunu seçin."
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "İşlenen görüntü için arka plan rengini seçin. Boş bir değer, bir bgcolor komutunun uygulanmayacağı anlamına gelir. Geçerli değer örnekleri: 'beyaz', 'ffff00', 'ffff0080', '128,64,32' ve '128,64,32,16'."
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "İşlenen görüntü için formatı seçin. Varsayılan bir değer, bir format komutunun uygulanmayacağı anlamına gelir."
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Tersine çevir"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1002,7 +1002,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Klasör Oluştur"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1030,7 +1030,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Öğeyi Yeniden Adlandır"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1060,13 +1060,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Medya"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Hepsi"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1085,43 +1085,43 @@ msgid "Exports all or specified media."
 msgstr "Tümünü veya belirtilen özel medyaları dışa aktarır."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " Küçük Thumbs"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " Büyük Thumbs"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}}} KB)"
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr "Bu dosya, bu site için belirlenen en yüksek dosya yükleme boyutunu aşıyor"
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr "Yüklemeler"
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr "Hatalar"
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr "Hataları Temizle"
@@ -1132,49 +1132,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Eklenti"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " Küçük Thumbs"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " Büyük Thumbs"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Medya Seç"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Tamam"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1294,7 +1294,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "Yeniden boyutlandırma için bir bağlantı noktası seçmeye izin verilip verilmediğini belirtir."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/tr/OrchardCore.Menu.po b/Localization/tr/OrchardCore.Menu.po
index 09af07a3e1a38..ea31e6c1d32ab 100644
--- a/Localization/tr/OrchardCore.Menu.po
+++ b/Localization/tr/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-03-02 10:14\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menüler"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Menü öğesi başarıyla silindi."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "Bu içerik öğesinin yayınlanması, oluşturulan içeriği silebilir. Herhangi bir içerik türü sorununu önceden düzeltin."
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "{0} Düzenle"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "Url"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Dokümantasyonu gör"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/tr/OrchardCore.Microsoft.Authentication.po b/Localization/tr/OrchardCore.Microsoft.Authentication.po
index 651f354894a0e..15bdddc857fe5 100644
--- a/Localization/tr/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/tr/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:25\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Microsoft Hesabı Kimlik Doğrulama Ayarı"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "Microsoft geliştirici portalı parametrelerinde bulunan Application ID."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Microsoft geliştirici portalı parametrelerinde bulunan Application Secret."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/tr/OrchardCore.Navigation.po b/Localization/tr/OrchardCore.Navigation.po
index f30a335405b23..8a5aac7ec382b 100644
--- a/Localization/tr/OrchardCore.Navigation.po
+++ b/Localization/tr/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/tr/OrchardCore.Notifications.po b/Localization/tr/OrchardCore.Notifications.po
index 1a65bb4211c27..c718b0e4c9335 100644
--- a/Localization/tr/OrchardCore.Notifications.po
+++ b/Localization/tr/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "Okundu Olarak İşaretle"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "Okunmadı Olarak İşaretle"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr "Kaldır"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -105,21 +105,21 @@ msgstr[0] "bildirim"
 msgstr[1] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr "{0} {1} başarıyla kaldırıldı."
@@ -145,15 +145,15 @@ msgid "Mark as read"
 msgstr "Okundu Olarak İşaretle"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "Tümünü Seç"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -258,13 +258,13 @@ msgid_plural "{0} items"
 msgstr[0] ""
 msgstr[1] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -324,13 +324,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "Sil"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -354,7 +354,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -378,10 +378,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -416,7 +416,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -428,7 +428,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -452,36 +452,31 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/tr/OrchardCore.OpenId.po b/Localization/tr/OrchardCore.OpenId.po
index b78fa44ca716a..56a1c52d8ba1f 100644
--- a/Localization/tr/OrchardCore.OpenId.po
+++ b/Localization/tr/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Bu ad başka bir kapsam(scope) tarafından alınmış."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "OpenID sunucu yapılandırması başarıyla güncellendi."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "OpenID doğrulama yapılandırması başarıyla güncellendi."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Yeni bir Uygulama Yarat"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "Müşteri Kimliği"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Görünen Ad"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Gizli uygulamalar, belirteç ve iptal uç noktalarıyla iletişim kurarken istemci sırrını GÖNDERMELİDİR. Bu, yalnızca yasal istemcinin bir yetkilendirme kodunu değiş tokuş etmesini veya bir yenileme belirteci almasını garanti eder."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Yenileme Simgesi Akışına İzin Ver"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Çıkış Noktasına İzin Ver"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Yeni bir alan oluşturun"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Görünen Ad"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Not: Sunucu kiracısı, kapsam istenmese bile her zaman erişim belirteci izleyicilerine dahil edilir."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Bir uygulamayı düzenleyin"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Müşteri Kimliği"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Görünen Ad"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Gizli uygulamalar, belirteç ve iptal uç noktalarıyla iletişim kurarken client secret GÖNDERMELİDİR. Bu, yalnızca yasal müşterinin bir yetkilendirme kodunu değiş tokuş etmesini veya bir yenileme belirteci almasını garanti eder."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Yenileme Simgesi Akışına İzin Ver"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Kapsam ekle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Görünen İsim"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "Not: Server tenant kapsam istenmese bile her zaman erişim belirteci izleyicilerine dahil edilir."
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ayarlar kaydedildiğinde mevcut tenant yeniden yüklenecektir."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "IdP için görünen ad"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "OpenIdConnect çağrıları yapılırken kullanılan yetki"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Kullanıcı aracısının döndürüleceği uygulamanın temel yolu içindeki istek yolu. Ara katman yazılımı bu isteği geldiğinde işleyecektir."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Gelen post_logout_redirect_uri'ye bakın "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "Uygulamanın kimlik sağlayıcısından çıkış yapıldıktan sonra kullanıcı aracısının yönlendirileceği uri. Yönlendirme, SignedOutCallbackPath çağrıldıktan sonra gerçekleşir."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "Kod Doğrulama Akışı"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr "'code' response türünü kullan"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "örnek:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "'code token' response türünü kullan"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Implicit Doğrulama Akışı"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "'id_token' response türünü kullan"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "'id_token token' response türünü kullan"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Response Modu"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Response Modunu Yapılandırın bkz: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "client secret ayarla."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr "Parametre Adı"
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr "Değer"
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr "Parametreleri listeden kaldır"
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr "Parametre ekle"
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr "Veriyi Düzenle"
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr "Parametreler"
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "İzin verilen değerlerin JSON temsili, örn. {0}"
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "Tamam"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr "Gelişmiş Parametreler"
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr "Yetkilendirme isteği ile gönderilebilecek gelişmiş parametreler."
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Bu seçeneklerin tümü isteğe bağlıdır ve yalnızca ileri düzey kullanıcılar içindir."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "Kimlik sunucusunun (bu site) temel URL'si. Hiçbiri sağlanmazsa, site ana bilgisayarına dayalı bir varsayılan değer otomatik olarak hesaplanır."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "Şifreleme sertifikası konumunu seçin."
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "Şifreleme sertifikası deposunu seçin."
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "OpenID Connect modülünü kurmak için sunucunuza bir sertifika eklemeniz gerekiyor."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "İmzalama sertifikası konumunu seçin."
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "İmzalama sertifikası deposunu seçin."
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "Bu seçenek etkinleştirildiğinde, yenileme jetonları kullanılmış olarak işaretlenmez ve süreleri dolana kadar yeniden kullanılabilir."
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ayarlar kaydedildiğinde mevcut tenant yeniden yüklenecektir."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Yetkilendirme sunucu tenantı"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "Uzak OpenID Connect sunucusunun adresi. Bir HTTPS adresi kullanılması şiddetle tavsiye edilir."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/tr/OrchardCore.Placements.po b/Localization/tr/OrchardCore.Placements.po
index 22f7a87405816..bf051104889cc 100644
--- a/Localization/tr/OrchardCore.Placements.po
+++ b/Localization/tr/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "\"{0}\" için yerleşim kuralları zaten var. Lütfen mevcut kuralı düzenleyin."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "\"{0}\" yerleşimi kaydedildi."
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "\"{0}\" yerleşimi boş."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "\"{0}\" yerleşimi silindi."
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "Yerleşim ayrıştırılırken bir hata oluştu<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "Yerleşim kaydedilirken bir hata oluştu."
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "Yerleşimler başarıyla kaldırıldı."
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "Yerleşimleri düzenle"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "Şeklin türü."
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/tr/OrchardCore.ProjectTemplates.po b/Localization/tr/OrchardCore.ProjectTemplates.po
index 82ccb162bfa24..c0bc709e3e8fb 100644
--- a/Localization/tr/OrchardCore.ProjectTemplates.po
+++ b/Localization/tr/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Göster"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/tr/OrchardCore.PublishLater.po b/Localization/tr/OrchardCore.PublishLater.po
index f3b7018110e48..d87bd96511abd 100644
--- a/Localization/tr/OrchardCore.PublishLater.po
+++ b/Localization/tr/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Daha Sonra Yayınla"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Yayınlamayı iptal et"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/tr/OrchardCore.Queries.po b/Localization/tr/OrchardCore.Queries.po
index ca6892f333c20..e6ddddc1c1ea6 100644
--- a/Localization/tr/OrchardCore.Queries.po
+++ b/Localization/tr/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "SQL Sorgusu Çalıştır"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "SQL sorgusu yürütülürken bir hata oluştu: {0}"
@@ -324,7 +324,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL Sorgu"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -342,7 +342,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "SQL sorgusu standart SQL92 sözdizimini kullanır ve gerçek veritabanına dayalı olarak dönüştürülür. Tablolar otomatik olarak ön eklenecektir."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Çalıştır"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -396,7 +396,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -408,7 +408,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Sorgunun teknik adı."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr "Eğer işaretlerseniz, Content Picker, Taxonomy, Tags ve Liste eleman ID'leri gibi alanları manuel olarak belirtip gerektiğinde değiştirmeniz gerekmektedir. Bu içerik öğelerine yapılan herhangi bir referans kaybolacaktır."
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -476,7 +476,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr "Not: Sorgu Belgeleri döndürecek şekilde yapılandırılmalı."
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -530,7 +530,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "İşaretlendiğinde, sonuç doküman id leri içeren bir liste olmak zorundadır."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/tr/OrchardCore.ReCaptcha.Core.po b/Localization/tr/OrchardCore.ReCaptcha.Core.po
index f552a38029676..aecec5ec4cfa5 100644
--- a/Localization/tr/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/tr/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2022-03-17 07:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Captcha doğrulamasında hata"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Captcha doğrulamasında hata"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "{0} isimli dil bulunamadı"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/tr/OrchardCore.ReCaptcha.po b/Localization/tr/OrchardCore.ReCaptcha.po
index f687c13f7d247..36f07ee7b5336 100644
--- a/Localization/tr/OrchardCore.ReCaptcha.po
+++ b/Localization/tr/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "ReCaptcha ayarlarını dışarı aktarır."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "ReCaptcha'yı Doğrula"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Doğrulama"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Geçerli"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Geçersiz"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Captcha doğrulama hatalı. Lütfen tekrar deneyin."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ayarlar kaydedildiğinde mevcut kiracı (tenant) yeniden yüklenir."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Google reCaptcha site anahtarı."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/tr/OrchardCore.Recipes.Core.po b/Localization/tr/OrchardCore.Recipes.Core.po
index 92177ec532352..ab29a265bd6be 100644
--- a/Localization/tr/OrchardCore.Recipes.Core.po
+++ b/Localization/tr/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/tr/OrchardCore.Roles.po b/Localization/tr/OrchardCore.Roles.po
index 22d0989a86046..e69dfee6a371a 100644
--- a/Localization/tr/OrchardCore.Roles.po
+++ b/Localization/tr/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Roller"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Geçersiz kullanıcı adı."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Rol başarıyla güncellendi."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Sistem rolleri silinemez."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Rol Oluştur"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Rol adı"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Role Detayı Düzenle"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "İzin"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Bu izin, kullanıcının diğer izinlerini yükseltmesine olanak sağlar. İzni verirken dikkatli olun."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Roller"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/tr/OrchardCore.Rules.po b/Localization/tr/OrchardCore.Rules.po
index 1fb4ee73726a2..43bc8bccf7d91 100644
--- a/Localization/tr/OrchardCore.Rules.po
+++ b/Localization/tr/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Tümü"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Herhangi"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Ekle"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "İçerik Türü"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "Kural operatörünü seçin."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Kültür"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Koşul operatörünü seçin."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "Rol"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Koşul operatörünü seçin."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "Koşul operatörünü seçin."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/tr/OrchardCore.Search.Elasticsearch.po b/Localization/tr/OrchardCore.Search.Elasticsearch.po
index e5950af19fa08..705137a17dbb6 100644
--- a/Localization/tr/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/tr/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr "Elasticsearch"
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr "Sil"
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Geçersiz sorgu : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr "Çalıştır"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,53 +572,53 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
-msgstr "Dokümantasyonu gör"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
+msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticSettingsDeploymentStep.Fields.Edit.cshtml:3
@@ -810,7 +846,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -852,7 +888,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -864,7 +900,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -882,7 +918,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/tr/OrchardCore.Search.Lucene.po b/Localization/tr/OrchardCore.Search.Lucene.po
index d39c3f099c226..aa47e8c1bcfd6 100644
--- a/Localization/tr/OrchardCore.Search.Lucene.po
+++ b/Localization/tr/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr "Lucene"
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr "Sıfırla"
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr "Yeniden Oluştur"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr "Sil"
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr "Tüm kültürler"
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr "{0} adlı bir dizin zaten var."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "{0} adlı bir dizin mevcut değil."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr "Lucene"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr "Lucene Indeksi Oluştur"
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr "İndeks Adı"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr "Çözümleyici Adı"
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -520,13 +520,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -568,13 +568,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -616,13 +616,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tümü"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -646,7 +646,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr "Çalıştır"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -688,7 +688,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr "Lucene Sorgusu"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -712,7 +712,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -802,7 +802,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr "Lucene Sorgusu"
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -814,7 +814,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr "Aranacak lucene indeksi"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -832,7 +832,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -863,7 +863,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/tr/OrchardCore.Search.po b/Localization/tr/OrchardCore.Search.po
index 57337ae74c466..f9f214fd69bab 100644
--- a/Localization/tr/OrchardCore.Search.po
+++ b/Localization/tr/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr "Arama sayfası için kullanılacak varsayılan arama sağlayıcısı."
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/tr/OrchardCore.Security.po b/Localization/tr/OrchardCore.Security.po
index d36ff01d71690..98e9b3cea2afa 100644
--- a/Localization/tr/OrchardCore.Security.po
+++ b/Localization/tr/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-03-02 10:14\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr "Geçerli ayarlar yapılandırma kaynaklarından gelmektedir, ayarların kaydedilmesi yapılandırmayı değil AdminSettings'i etkiler."
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr "Yöneticilerin, kullanıcı aracısının belirli bir sayfa için yüklemesine izin verilen kaynakları kontrol etmesine izin verir."
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr "Bir sitenin tarayıcıda hangi özelliklerin ve API'lerin kullanılabileceğini kontrol etmesine izin verir."
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/tr/OrchardCore.Seo.po b/Localization/tr/OrchardCore.Seo.po
index 8dfe24087626f..77912b14b54e4 100644
--- a/Localization/tr/OrchardCore.Seo.po
+++ b/Localization/tr/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "Bu sayfa için meta verilerin oluşturulup oluşturulmayacağını belirtir."
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr "Varsayılan olarak oluşturulan web tarayıcı sayfası başlığını geçersiz kılın (70 karakterin altında tutulması önerilir)."
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr "Bu sayfa için oluşturulacak meta açıklama."
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr "Bu sayfa için oluşturulacak meta anahtar kelimeler, virgülle ayrılmıştır."
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr "Varsayılan standart Url'yi geçersiz kılın."
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Veri Düzenle"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr "Sosyal Meta Ayarları Google Şeması varsayılan olarak kullanılır veya burada geçersiz kılınabilir."
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr "Sosyal Meta Ayarları Açık Grafik Türü varsayılan olarak kullanılır veya burada geçersiz kılınabilir."
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Başlık varsayılan olarak kullanılır, ardından Sayfa Başlığı veya burada geçersiz kılınabilir."
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr "Google Şema panelini görüntülemek için işaretleyin."
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr "Başlık varsayılan olarak kullanılır, ardından Sayfa Başlığı veya geçersiz kılınabilir."
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr "Meta Açıklama varsayılan olarak kullanılır veya burada geçersiz kılınabilir."
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr "Sosyal Meta Ayarları Twitter Kartı varsayılan olarak kullanılır veya burada geçersiz kılınabilir."
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr "Sosyal Meta Ayarları Twitter Creator varsayılan olarak kullanılır veya burada geçersiz kılınabilir."
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/tr/OrchardCore.Settings.po b/Localization/tr/OrchardCore.Settings.po
index 97096644781ad..0d1ca5398c1b4 100644
--- a/Localization/tr/OrchardCore.Settings.po
+++ b/Localization/tr/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Site ayarları başarıyla güncellendi."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr "Sayfa sayısı sıfırdan büyük olmalıdır."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr "Sayfa sayısı {0} sayısına eşit veya küçük olmalıdır."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Temel URL, tam nitelikli bir URL olmalıdır."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Site Ayarları"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/tr/OrchardCore.Setup.Core.po b/Localization/tr/OrchardCore.Setup.Core.po
index 1e851861a3c15..a5f03039e8ff6 100644
--- a/Localization/tr/OrchardCore.Setup.Core.po
+++ b/Localization/tr/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/tr/OrchardCore.Setup.po b/Localization/tr/OrchardCore.Setup.po
index 8d4a452cda99b..b6a95435a8dad 100644
--- a/Localization/tr/OrchardCore.Setup.po
+++ b/Localization/tr/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Şifre en az {0} olmalı."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Tarifi olmayan bir site kurmak mümkün değildir."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Bu, sayfalarınızın varsayılan başlığı olarak kullanılır."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Tarifler sitenizi önceden yapılandırılmış ayarlar, özellikler ve seçenekler kullanarak kurmanızı sağlar."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Tarih ve saatleri görüntülerken ve düzenlerken kullanılan varsayılan zaman dilimini belirler."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Veri tabanı, siteye ait yapılandırma bilgilerini ve sitenin içeriklerini saklamak için kullanılır."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Eğer aynı veri tabanını birden fazla site için kullanmayı düşünüyorsanız tablo ön eki belirleyebilirsiniz."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Bağlantı metnini göster/gizle"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Süper kullanıcı bütün yetkilere sahiptir. Sadece kurulum esnasında ve kurtarma işlemlerinde kullanılmalıdır."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Bu e-posta geçerli değil."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Şifre dayanıklılığı"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/tr/OrchardCore.Shortcodes.po b/Localization/tr/OrchardCore.Shortcodes.po
index 85bea78260e24..c7cd71bff9c98 100644
--- a/Localization/tr/OrchardCore.Shortcodes.po
+++ b/Localization/tr/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "Şablon içeriği zorunludur."
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Şablon geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "Kısa kod şablonu başarıyla silindi."
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "Kısa kod şablonları başarıyla kaldırıldı."
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "Kısa Kod Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "Kısa kodun adı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "Kısa kod için ipucu."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "Kısa kodun örnek kullanımı."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "Bu kısa kod için kategoriler."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "Seçildiğinde kısa kodun varsayılan değeri. Varsayılan olarak [isim]'dir."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "Kısa Kodu Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "Kısa kodun adı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "Kısa kod için ipucu."
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "Kısa kodun örnek kullanımı."
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "Bu kısa kod için kategoriler."
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "Seçildiğinde kısa kodun varsayılan değeri. Varsayılan olarak [isim]."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/tr/OrchardCore.Sitemaps.po b/Localization/tr/OrchardCore.Sitemaps.po
index c6973b945a891..8743d36f62b42 100644
--- a/Localization/tr/OrchardCore.Sitemaps.po
+++ b/Localization/tr/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Site ayarları 'Temel url' özelliği boş, ancak site haritaları oluşturmak için gerekli."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Site ayarları 'Temel url' özelliği boş, ancak site haritaları oluşturmak için gerekli."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Site haritası dizinine yönlendirmeyi devre dışı bırakmak için işareti kaldırın."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr "Site Haritası Özel Yolu"
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr "Site haritasına eklenecek yol. Örneğin. yol/bir şeye/bir şeye"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr "Bu yolun büyük olasılıkla değişeceği varsayılan frekans."
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Site ayarları 'Temel url' özelliği boş, ancak site haritaları oluşturmak için gerekli."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "Site ayarları 'Temel url' özelliği boş, ancak site haritaları oluşturmak için gerekli."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "İsim"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "Site haritası dizinine yönlendirmeyi devre dışı bırakmak için işareti kaldırın."
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1020,7 +1020,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "Bu içerik öğesini site haritasından hariç tutmak için işaretleyin."
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1032,7 +1032,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "Bu içerik öğesinin değişme olasılığı yüksektir."
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/tr/OrchardCore.Sms.po b/Localization/tr/OrchardCore.Sms.po
index 5852659f9ac52..6fe121d7f573c 100644
--- a/Localization/tr/OrchardCore.Sms.po
+++ b/Localization/tr/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/tr/OrchardCore.Spatial.po b/Localization/tr/OrchardCore.Spatial.po
index 2c988b64a2e5d..c07468f739a3b 100644
--- a/Localization/tr/OrchardCore.Spatial.po
+++ b/Localization/tr/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "Broşür düzenleyici"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Bir değerin gerekli olup olmadığı."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/tr/OrchardCore.Taxonomies.po b/Localization/tr/OrchardCore.Taxonomies.po
index 7622c182ced83..eccad912ad079 100644
--- a/Localization/tr/OrchardCore.Taxonomies.po
+++ b/Localization/tr/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "{0} için bir değer gerekli"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Taksonomi Filtreleri"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Etiketler"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomi bulunamadı. Lütfen bu alan için ayarları kontrol edin."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Etiket oluşturulurken hata oluştu"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Aramak için yazın"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Seç"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Kaldır"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Etiket oluşturmak için enter'a basın"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Etiket bulunamadı"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Etiketler"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Taksonomi bulunamadı. Lütfen bu alan için ayarları kontrol edin."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Bu alan için düzenleyicide görüntülenecek ipucu metni."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Taksonomi"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Zorunlu"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "En az bir öğenin seçili olup olmadığını belirtir."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Eşsiz"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Yalnızca bir öğenin seçilip seçilemeyeceğini belirtir."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Sadece leaves"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Yaprakların seçilebilecek tek öğe olup olmadığını belirtir."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Yeni etiketlerin satır içi oluşturulup oluşturulamayacağını belirtir. Not: Satır içi etiketler oluştururken, yalnızca görüntüleme metni terimi özelliği ayarlanacaktır."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Terim İçerik Türü"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "{0} Ekle"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Taksonomiyi yeniden düzenlediniz."
diff --git a/Localization/tr/OrchardCore.Templates.Cms.Module.po b/Localization/tr/OrchardCore.Templates.Cms.Module.po
index 0df26dd6646f3..2221487346a16 100644
--- a/Localization/tr/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/tr/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Göster"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/tr/OrchardCore.Templates.po b/Localization/tr/OrchardCore.Templates.po
index 7aa65c8bc4707..a8fb6f0983000 100644
--- a/Localization/tr/OrchardCore.Templates.po
+++ b/Localization/tr/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "\"{0}\" şablonu oluşturuldu."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Şablon başarıyla silindi."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Şablonlar başarıyla kaldırıldı."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "Tüm Şablonlar"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Önizleme"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Şablonun adı."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Şablonun açıklaması."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Önizleme"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Şablonun adı."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Şablonun açıklaması."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/tr/OrchardCore.Tenants.po b/Localization/tr/OrchardCore.Tenants.po
index e7e6c1738868b..9938e2d7021da 100644
--- a/Localization/tr/OrchardCore.Tenants.po
+++ b/Localization/tr/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Kiracılar"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "Tümü"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Tüm durumlar"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Çalışıyor"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Devre Dışı"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Başlatılmamış"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "İsim"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Durum"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Devredışı"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Etkin"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Varsayılan kiracıyı (tenant) devre dışı bırakamazsınız."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "'{0}' tenant'ı devre dışı."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "'{0}' tenant'ı etkin."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Yalnızca etkin tenant'lar devre dışı bırakılabilir."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "{0} kullanıcı adı geçersiz, sadece harf ve rakamlardan oluşabilir."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "Geçersiz e-posta adresi."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Tenant bulunamadı: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Tenant ayarlanamıyor."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Veri tabanı sağlayıcı tanımlı değil."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Bu veritabanı sağlayıcısı için bağlantı dizesi gereklidir."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "'Recipe' veya 'RecipeName' gereklidir."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "'{0}' recipe'i bulunamadı."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Kiracı Oluştur"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Tenant Oluştur"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Oluşturulacak tenant'ın adını seçin."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "(Opsiyonel) kiracının (tenant) tanımını oluştur."
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Örnek: Ana bilgisayar \"orchardproject.net\" ise, tenant site URL'si \"http://orchardproject.net/\" olur. Liquid destekli."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Ne tür bir veritabanı kullanılacak?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tablo ön eki"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Bağlantı metni"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Komut"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Tenantı Devre Dışı Bırak"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Kiracı Düzenle"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Tenantı Etkinleştir"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Tenantı Etkinleştir."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1226,8 +1220,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr "Geçersiz"
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Tasarla"
@@ -1244,7 +1238,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Tenant Kur"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1256,49 +1250,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Kurmak için kiracının adını seçin."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Site ismi"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Yönetici Kullanıcı Adı"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Yönetici E-postası"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Yönetici parolası"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Ne tür bir veritabanı kullanılacak?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tablo öneki"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Bağlantı dizisi"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1316,7 +1310,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/tr/OrchardCore.Tests.po b/Localization/tr/OrchardCore.Tests.po
index 6f12548bb584a..a3c8b3cb581fb 100644
--- a/Localization/tr/OrchardCore.Tests.po
+++ b/Localization/tr/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-03-20 14:44\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr "Görev Ekle"
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr "Test"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr "Tamamlandı"
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr "Test"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr "Tamamlandı"
diff --git a/Localization/tr/OrchardCore.Themes.po b/Localization/tr/OrchardCore.Themes.po
index 5963255e929ce..d57dd259279a7 100644
--- a/Localization/tr/OrchardCore.Themes.po
+++ b/Localization/tr/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Mevcut site ve yönetim paneli temasını dışarı aktarır."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/tr/OrchardCore.Title.po b/Localization/tr/OrchardCore.Title.po
index 84e4968a72340..14cc0927eb81e 100644
--- a/Localization/tr/OrchardCore.Title.po
+++ b/Localization/tr/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Başlık için bir değer gereklidir."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Desen geçerli bir Liquid ifadesi içermiyor. Ayrıntılar: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Başlık, desen kullanarak otomatik oluşturulacaktır."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Başlığı ekran görünümlerinde oluşturmak için işaretleyin."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/tr/OrchardCore.Twitter.po b/Localization/tr/OrchardCore.Twitter.po
index c4a6b5c52ed94..0ec05be47d1c9 100644
--- a/Localization/tr/OrchardCore.Twitter.po
+++ b/Localization/tr/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Access token secret gereklidir"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Twitter Durum Görevini Güncelle"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Sosyal"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Başarısız"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Ayarlar kaydedildiğinde mevcut kiracı yeniden yüklenir."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Dokümantasyonu gör"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "Bir ayarın şifresi çözülürken bir hata oluştu. Lütfen uygulayın ve kaydedin."
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Google Entegrasyon Ayarları"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API anahtarı"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Twitter uygulaması panosunun Anahtarlar ve belirteçler sekmesinde tanımlanan API anahtarı."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "API Gizli Anahtarı"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Twitter panosunun key ve tokenlarında tanımlanan API secret."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Erişim Anahtarı"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Twitter panosunun key ve tokenlarında tanımlanan access token."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Twitter panosunun key ve tokenlarındaki access token secret."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Twitter Ayarları ile oturum açın"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Twitter Durumunu Güncelle"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/tr/OrchardCore.Users.Core.po b/Localization/tr/OrchardCore.Users.Core.po
index e7b6188ba38f7..21ed62f07626a 100644
--- a/Localization/tr/OrchardCore.Users.Core.po
+++ b/Localization/tr/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -38,7 +38,7 @@ msgstr "Şifre zorunludur."
 #: OrchardCore.Users.Core\Services\UserService.cs:96
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "The specified username/password couple is invalid."
-msgstr "Kullanıcı adı/şifre çifti geçersiz."
+msgstr "Kullanıcı adı/şifre ikilisi geçersiz."
 
 #. reportError(string.Empty, S["The user is locked out."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:81
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "{0} eposta geçersiz."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Beklenmeyen hata : {0}."
diff --git a/Localization/tr/OrchardCore.Users.po b/Localization/tr/OrchardCore.Users.po
index 58aa9bb372ce2..34cc44a080b17 100644
--- a/Localization/tr/OrchardCore.Users.po
+++ b/Localization/tr/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Kullanıcı başarıyla oluşturuldu"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Yerel haberler devre dışı bırakıldı."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Kullanıcı kilitlendi"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Geçersiz giriş denemesi."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Şifreniz başarıyla değiştirildi."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Harici sağlayıcıda bir hata oluştu."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Site, kullanıcı kaydına izin vermiyor."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Hesabınızı onaylayın"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Belirtilen kullanıcının girişine izin verilmedi."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Lütfen e-postanızı doğrulayın"
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Tüm Kullanıcılar"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Kullanıcıyı Etkinleştir"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Devre Dışı Kullanıcılar"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Ad"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "E-Posta"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Onayla"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Etkinleştir"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Devre Dışı Bırak"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Sil"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Tüm roller"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "Kimliği doğrulandı (rol yok)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "{0} kullanıcısı başarıyla onaylandı."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "{0} kullanıcısı başarıyla silindi."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "{0} kullanıcısı başarıyla devre dışı bırakıldı."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "{0} kullanıcısı başarıyla etkinleştirildi."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Kullanıcı başarıyla oluşturuldu."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Kullanıcı başarıyla güncellendi."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Kullanıcı başarıyla silindi."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Kullanıcı silinemedi."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Şifre güncellendi."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Kullanıcının engeli başarıyla kaldırıldı."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Kullanıcı silinemedi."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "Kendi rollerinizi güncelleyemezsiniz."
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Oturum açma ayarları"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Yönetici ayarlarını dışarı aktarır."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "E-posta ayarlarını değiştir"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "E-postayı Değiştir ayarlarını dışa aktarır."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Kayıt ayarları"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Kayıt ayarlarını dışa aktarır."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Şifre ayarlarını sıfırla"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Parola sıfırlama ayarlarını dışa aktarır."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Yeni şifre ve doğrulama şifresi eşleşmiyor."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Kullanıcı Rol Atama Görevi"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Kullanıcı"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Başarısız"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Kullanıcı Kayıt Görevi"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Kullanıcı"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Geçerli"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Geçersiz"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "E-posta servisi yok"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "Kullanıcı Güncelleme Etkinliği"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Kullanıcı"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "Kullanıcı Görevini Doğrula"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Anonim"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Kimlik Doğrulandı"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "Rol İçi"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "{0} için bir değer gerekli."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0}, {1} rolüne"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Atanacak Kullanıcı. Liquid destekli."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Mevcut şifre"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Yeni Şifre"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Kullanıcı Oluştur"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Şifreyi düzenle"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Yeni Şifre"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Şifrenizi sıfırlamak için lütfen e-postanızı kontrol edin."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "E-Postanı Değiştir"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "<strong>{0}</strong> ile başarıyla kimlik doğrulaması yaptınız. Bu e-posta adresiyle zaten bir hesabınız var. Yerel hesap parolanızı girin ve hesapları bağlamak ve oturum açmayı tamamlamak için Kaydol düğmesini tıklayın."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "E-Posta"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Oturum Aç"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Oturum açmak için başka bir hizmet kullanın"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "{0} hesabınızı kullanarak giriş yapın"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Yeni bir hesap oluştur."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "E-Posta"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Şifre"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "<strong>{0}</strong> ile başarıyla kimlik doğrulaması yaptınız. Kayıt işlemini tamamlamak için lütfen aşağıdaki formu doldurun ve Kayıt Ol düğmesine tıklayın."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "E-Posta"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Şifre"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Onaylama E-postası Gönder"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "Mesajın konusu. Liquid sözdizimini destekler."
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "Ana Sayfa"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "E-Posta"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Yeni Şifre"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Kullanıcı devre dışı."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Etkin Kullanıcı."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Bu kullanıcı hesabını devre dışı bırakmak için işareti kaldırın."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3352,7 +3424,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "İptal"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3418,7 +3490,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3442,17 +3514,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "Kullanıcının kimliği doğrulanmışsa 'KullanıcıAdı' iş akışı özelliğini ayarlayın"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "Roller"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "Kullanıcının seçilen rollerden en az birine sahip olması durumunda 'InRole' sonucu başlar."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/tr/OrchardCore.Widgets.po b/Localization/tr/OrchardCore.Widgets.po
index 700e80165ee5a..12bb7bdd87ac8 100644
--- a/Localization/tr/OrchardCore.Widgets.po
+++ b/Localization/tr/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Widget ekle"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Standart"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/tr/OrchardCore.Workflows.po b/Localization/tr/OrchardCore.Workflows.po
index 7431fa8f446d2..73db7bafbaf3d 100644
--- a/Localization/tr/OrchardCore.Workflows.po
+++ b/Localization/tr/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "İşlemi Tamamla"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Oturum"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Tamamlandı"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Geçerli"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Geçersiz"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Correlate Görevi"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Temel öğeler"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Tamamlandı"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "For Each Görevi"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Yinele"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Tamamlandı"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Fork Görevi"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "For Döngüsü Görevi"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Yinele"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Tamamlandı"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "If Else Görevi"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Doğru"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Yanlış"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Join Görevi"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Eklendi (Bağlandı)"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Log Görevi"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Temel öğeler"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Tamamlandı"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "İstisnalar"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Bildirim Görevi"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Kullanıcı Arayüzü"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Tamamlandı"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Komut Dosyası"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Çıktı Hazırla"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Temel öğeler"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Özellik Ayarla"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Temel öğeler"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Döngü Görevi"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Kontrol Akışı"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Yinele"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Bitti"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Etkinlik başarıyla güncellendi."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Yakın Zamanda Oluşturan"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "En son oluşturulan"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Hata"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Tamamlandı"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Sil"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "{0} iş akışı silindi."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Sil"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "{0} iş akışı silindi."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "İş akışı kaydedildi."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "{0} isimli iş akışı silindi"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Http Yönlendirme Görevi"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Bitti"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Http İstek Olayı"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Bitti"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Eşleşti"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Http İstek Görevi"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "İşlenmeyen Http Durumu"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Http Yanıt Görevi"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Bitti"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "'{0}' tetiklemek için yetkiniz yok."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Başlangıç görevi"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Düzenle"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Ekle"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Bağdaştır"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Geri"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Bu iş akışı ögesini silmek istediğinize emin misiniz?"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Sil"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Gelişmiş sekmesinde geçersiz kilit süre sonu değeri"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "Bu türde bir iş akışını atomik olarak devam ettirmeden önce bir kilit elde etmek için milisaniye cinsinden zaman aşımı. Herhangi bir kilit kullanmamak için sıfır olarak bırakın."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Kullanılabilir Olaylar"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Etkin Görevler"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Bu etkinliği silmek istediğinizden emin misiniz?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Filtrele"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "Gelişmiş sekmesinde geçersiz kilit süre sonu değeri"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "Bu türde bir iş akışını atomik olarak devam ettirmeden önce bir kilit elde etmek için milisaniye cinsinden zaman aşımı. Herhangi bir kilit kullanmamak için sıfır olarak bırakın."
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "<em>{0}</em> ile  <em>{1}</em> yineleyin"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Yinelenecek liste. JavaScript desteği ile."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Fork yok"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "<em>{1}</em> ile <em>{2}</em> arasında <em>{0}</em> yineleyin"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Başlangıç değeri. JavaScript desteği ile."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Bitiş değeri. JavaScript desteği ile."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Döngü Adım değeri. JavaScript desteği ile."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "HTTP  Yönlendirme"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "Yönlendirilecek URL. Liquid desteği ile."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Kalıcı"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Yönlendirmenin kalıcı olup olmadığını kontrol edin (301). Geçici bir yönlendirme için işareti kaldırın (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Gelen HTTP İsteğini işleyin"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Bu URL' yi çağıran herkes bu iş akışını tetikleyebilir. Güvenli bir yerde saklayın."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Sahtecilik Anahtarını Doğrulayın"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "İstek, bu URL' yi web kancası olarak çağıran bir hizmetten geliyorsa bu seçeneğin işaretini kaldırın. Bu URL bir formdan isteniyorsa, form değerlerinin tahrif edilmediğinden emin olmak için bu seçeneği işaretli tutun."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Anahtar Ömrü"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Bu değeri değiştirdikten sonra <b>Yenile</b> düğmesine basın."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Anahtar bitiş süresi. Süresiz olması için 0 değerini veriniz"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Gelen HTTP İsteğini Filtrele"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Eşlenecek HTTP yöntemi."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Eşlenecek denetleyici adı."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Eşlenecek eylem adı."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr "<em>{0} {1}</em>"
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "İsteği gönderilecek URL. Liquid söz dizimini destekler."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "HTTP Yöntemi. Örneğin: GET, POST, PUT, PATCH, SEÇENEKLER, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "İstek gövdesinin içerik türü."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "POST, PUT ve PATCH istekleriyle gönderilecek gövde. Liquid desteği ile."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Her satıra bir tane olacak şekilde ek HTTP başlıkları sağlayın. Örneğin: Authorization: Taşıyıcı 123ABC. Liquid desteği ile."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP Cevap"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Geri gönderilecek HTTP Durum Kodu. Tam liste için <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Burayı Tıklayın</a>"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Yanıt gövdesinin içerik türü."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Geri gönderilecek metin gövdesi. Liquid desteği ile."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Değerlendir <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Sırala"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "Bu iş akışı ögesini silmek istediğinize emin misiniz?"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Sil"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "{0} oluşturuldu"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong> Burada hiçbir şey yok! </strong> Şu anda durdurulan iş akışı türü yok."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Geri"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "seçili"
@@ -1838,13 +1916,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Devre Dışı"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 örnek"
-msgstr[1] "{0} örnek"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1878,7 +1954,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Yürütmeyi tek bir yola eklemeden önce <strong> gelen </strong> etkinlikleri bekler."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1908,7 +1984,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Kayıt"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1920,7 +1996,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Kayıt (Log) düzeyi."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1968,7 +2044,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} Bildirim"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1980,7 +2056,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Bildirim türü."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2010,7 +2086,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Betik"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2022,7 +2098,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Virgülle ayrılmış bir sonuç listesi."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2052,7 +2128,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "{0} üzerinden çıktı"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2064,7 +2140,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Çıktıda görünecek isim."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2094,7 +2170,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "{0} Özellik Ayarla"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2106,7 +2182,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Ayarlanacak özellik. Belirtilen özellik henüz mevcut değilse, eklenecektir."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2142,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "<em> {0} </em> tetiklendiğinde"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2254,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr "<em>{0}</em>"
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2308,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Kullanıcı eylemi belirtilmedi"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2320,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Bir eylem girin veya birden fazla eylemi virgülle ayırın."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2356,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "<em>{0}</em> doğru iken döngü"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2380,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Koşul doğru iken tekrar edin."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/tr/TheAdmin.po b/Localization/tr/TheAdmin.po
index 53f7f7e989d3f..88a9e04d81370 100644
--- a/Localization/tr/TheAdmin.po
+++ b/Localization/tr/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Aydınlık tema"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Karanlık tema"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Siteyi görüntüle"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Açılır/Kapanır menü"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Sil"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Bu öğeyi silmek istediğinizden emin misiniz?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Tamam"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "İptal"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/tr/TheAgencyTheme.po b/Localization/tr/TheAgencyTheme.po
index cc954d514ee7c..35dbd90da8dd3 100644
--- a/Localization/tr/TheAgencyTheme.po
+++ b/Localization/tr/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Hiçbir sonuç bulunamadı."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Sayfa Bulunamadı"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "İstediğin sayfa bulunamadı."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/tr/TheBlogTheme.po b/Localization/tr/TheBlogTheme.po
index 651b1a3f1d7e1..a0970947fedd6 100644
--- a/Localization/tr/TheBlogTheme.po
+++ b/Localization/tr/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "{0} da"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Hiçbir sonuç bulunamadı."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Sayfa Bulunamadı"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/tr/TheTheme.po b/Localization/tr/TheTheme.po
index 27b82680074e7..3a71731ccadea 100644
--- a/Localization/tr/TheTheme.po
+++ b/Localization/tr/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,53 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Orchard Framework'e hoş geldiniz, siteniz başarılı bir şekilde oluşturuldu."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/uk/OrchardCore.Admin.po b/Localization/uk/OrchardCore.Admin.po
index 9ef526b0e68e2..e4c3d83587c00 100644
--- a/Localization/uk/OrchardCore.Admin.po
+++ b/Localization/uk/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Адмін"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Налаштування адміністратора"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Ексторт налаштувань адміністратора."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Ласкаво просимо до Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Ви можете вільно переглядати меню та відкривати всі його можливості."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Увімкнути темну тему адмін. частини"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Чи може показуватися темний режим теми адміністратора."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Чи показувати заголовки у верхній панелі."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Адміністратор"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/uk/OrchardCore.AdminDashboard.po b/Localization/uk/OrchardCore.AdminDashboard.po
index ad8066d1b1a11..bc484121dae5b 100644
--- a/Localization/uk/OrchardCore.AdminDashboard.po
+++ b/Localization/uk/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Ні"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Розташування"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Ширина"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/uk/OrchardCore.AdminMenu.po b/Localization/uk/OrchardCore.AdminMenu.po
index c4dd90a4a8aeb..38ef2f382fceb 100644
--- a/Localization/uk/OrchardCore.AdminMenu.po
+++ b/Localization/uk/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Створити меню адміністратора {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Назва"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Створити вузол"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Редагувати меню адміністратора: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Назва"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Змінити вузол"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Позиція розміщення цього посилання в меню адміністратора."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Посилання"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Текст посилання, як він буде відображатися в дереві."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Url-адреса посилання. Посилання буде показано, лише якщо вона або одна з їх підпорядкувань має посилання. Url-адреса буде відноситися до кореня адміністративної частини"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Вибрати іконку"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Поле для заповнення"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -587,7 +587,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Текст пункту меню як він буде показаний у дереві."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -600,49 +600,49 @@ msgid "Pick"
 msgstr "Вибрати"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Виберіть значок, щоб відображати, коли цей пункт меню знаходиться на першому рівні."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Вибрати іконку"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Дозволи"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Введіть для пошуку"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Обрати"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Видалити"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Результатів не знайдено"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Ці дозволи необхідні для відображення цього пункту меню (необов'язково)."
diff --git a/Localization/uk/OrchardCore.Alias.po b/Localization/uk/OrchardCore.Alias.po
index 8049a3569a3f6..fb6cb0471fdf7 100644
--- a/Localization/uk/OrchardCore.Alias.po
+++ b/Localization/uk/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не містить дійсного виразу Liquid. Деталі: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Залиште порожнім, щоб повторно генерувати його."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Псевдонім створений і редагування вимкнено"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/uk/OrchardCore.ArchiveLater.po b/Localization/uk/OrchardCore.ArchiveLater.po
index 8716b7867b4af..750bf0bec3f08 100644
--- a/Localization/uk/OrchardCore.ArchiveLater.po
+++ b/Localization/uk/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/uk/OrchardCore.AuditTrail.po b/Localization/uk/OrchardCore.AuditTrail.po
index 45878ff54a2da..5143d0eab3274 100644
--- a/Localization/uk/OrchardCore.AuditTrail.po
+++ b/Localization/uk/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Всі категорії"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Власний діапазон дат"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -635,7 +635,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -647,7 +647,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/uk/OrchardCore.Autoroute.po b/Localization/uk/OrchardCore.Autoroute.po
index 08a95a9ff04a3..8c266a63280ac 100644
--- a/Localization/uk/OrchardCore.Autoroute.po
+++ b/Localization/uk/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/uk/OrchardCore.BackgroundTasks.po b/Localization/uk/OrchardCore.BackgroundTasks.po
index 517e34c87c976..b1ea6366fc827 100644
--- a/Localization/uk/OrchardCore.BackgroundTasks.po
+++ b/Localization/uk/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Додатково"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/uk/OrchardCore.ContentFields.po b/Localization/uk/OrchardCore.ContentFields.po
index 5d7cb98c15e32..c0e147f016ebe 100644
--- a/Localization/uk/OrchardCore.ContentFields.po
+++ b/Localization/uk/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Переключити"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Стандарт"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст підказки, який буде показано для цього поля в редакторі."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Немає елементів контенту."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Стандартний"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Не опубліковано"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Введіть для пошуку"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Обрати"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Видалити"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Нічого не знайдено"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Показувати всі типи вмісту"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст підказки, який буде показано для цього поля в редакторі."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Локалізований"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Стандарт"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Чи обов'язкове значення."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст підказки, який буде показано для цього поля в редакторі."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Чи обов'язкове значення."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Візуальний редактор"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Стандарт"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документація по опціям"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документація по опціям"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Текст посилання"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Текст підказки, що відображає url для редактора."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Текст підказки, що відображатиметься для тексту посилання на редакторі."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Немає елементів контенту."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Стандартний"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Не опубліковано"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Введіть для пошуку"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Обрати"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Видалити"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Результатів не знайдено"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Введіть для пошуку"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Обрати"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Видалити"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Не знайдено значень"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Чи обов'язкове значення."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Змінити дані"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Діапазон"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Жоден"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Введіть параметри редактора."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Змінити дані"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст підказки, який буде показано для цього поля в редакторі."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Чи обов'язкове значення."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "Немає користувачів."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "Стандартний"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Не увімкнено"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Введіть для пошуку"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Обрати"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Видалити"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Результатів не знайдено"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Обов’язково"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Чи обов'язкове значення."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Підказка"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст підказки, який буде показано для цього поля в редакторі."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Ширина"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Ширина відеобоксу"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Висота"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Висота відеобоксу"
diff --git a/Localization/uk/OrchardCore.ContentLocalization.po b/Localization/uk/OrchardCore.ContentLocalization.po
index b22fbaa6edece..3a0e4978cb6c0 100644
--- a/Localization/uk/OrchardCore.ContentLocalization.po
+++ b/Localization/uk/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "Не вдалося створити локалізовану версію елементу."
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/uk/OrchardCore.ContentPreview.po b/Localization/uk/OrchardCore.ContentPreview.po
index 4024ca2dbf8a1..f22903893fc59 100644
--- a/Localization/uk/OrchardCore.ContentPreview.po
+++ b/Localization/uk/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не містить дійсного виразу Liquid. Деталі: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Попередній перегляд"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Попередній перегляд відключений"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Помилка перегляду"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/uk/OrchardCore.ContentTypes.po b/Localization/uk/OrchardCore.ContentTypes.po
index c4e035227fa22..2a8c08d552864 100644
--- a/Localization/uk/OrchardCore.ContentTypes.po
+++ b/Localization/uk/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Частини контенту"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Назва не може бути пустим."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Додати нове поле до \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Ім'я поля, яке буде відображатися на екранах."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "Технічне ім'я цієї частини."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Новий тип вмісту"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Створити"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Поля"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Редагувати"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Видалити"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Додати поле"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Частини"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Додати частини"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Зберегти"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Видалити"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Зберегти"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Скасувати"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr ""
diff --git a/Localization/uk/OrchardCore.Contents.po b/Localization/uk/OrchardCore.Contents.po
index 1dbb89eadb767..ede29ff5e37ae 100644
--- a/Localization/uk/OrchardCore.Contents.po
+++ b/Localization/uk/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr ""
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Всі типи вмісту"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Контент"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Готово"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Дата створення або першої публікації елемента контенту."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "та продовжити"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Дії"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Всі типи вмісту"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Будь-який тип вмісту"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Вміст"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Будь-який тип вмісту"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "Елемент вмісту"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1739,7 +1739,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1781,13 +1781,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Обрати іконку"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1837,9 +1837,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1853,9 +1853,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2031,7 +2031,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Всі"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2067,7 +2067,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Всі типи вмісту"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2103,7 +2103,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Всі типи вмісту"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2139,7 +2139,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Всі типи вмісту"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2175,7 +2175,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Створити контент"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2199,7 +2199,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2241,7 +2241,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2289,37 +2289,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Переглянути чернетки як JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2349,7 +2349,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2439,7 +2439,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2515,8 +2515,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Контент"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Новий"
@@ -2539,7 +2539,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2581,7 +2581,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2623,7 +2623,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2665,7 +2665,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2677,7 +2677,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/uk/OrchardCore.CustomSettings.po b/Localization/uk/OrchardCore.CustomSettings.po
index 1a895a8b5c163..1963ce7c135b9 100644
--- a/Localization/uk/OrchardCore.CustomSettings.po
+++ b/Localization/uk/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Власні налаштування"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Всі"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/uk/OrchardCore.Data.YesSql.po b/Localization/uk/OrchardCore.Data.YesSql.po
index 0a785e79b6d1e..1d9b21390dbfe 100644
--- a/Localization/uk/OrchardCore.Data.YesSql.po
+++ b/Localization/uk/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/uk/OrchardCore.Demo.po b/Localization/uk/OrchardCore.Demo.po
index 0f0b37e623235..e057c33447848 100644
--- a/Localization/uk/OrchardCore.Demo.po
+++ b/Localization/uk/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Ім’я"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Прізвище"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/uk/OrchardCore.Deployment.Remote.po b/Localization/uk/OrchardCore.Deployment.Remote.po
index 285655b8ad9a7..25ab76788c5ab 100644
--- a/Localization/uk/OrchardCore.Deployment.Remote.po
+++ b/Localization/uk/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Надсилає план розгортання до віддаленої інстанції."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Ім'я клієнта"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Створення віддаленого екземпляра"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Ім’я"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "URL-адреса"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Ім'я клієнта"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Редагувати віддаленого клієнта"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Ім'я клієнта"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/uk/OrchardCore.Deployment.po b/Localization/uk/OrchardCore.Deployment.po
index 87dfc7defb16f..3617a6a7a5521 100644
--- a/Localization/uk/OrchardCore.Deployment.po
+++ b/Localization/uk/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Імпорт JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Видалити"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Плани розгортання успішно видалені."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Назва обов'язкова."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "Файл з такою назвою вже існує."
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Файл успішно оновлено."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Файл успішно видалено."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -578,7 +578,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -620,7 +620,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -632,7 +632,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -656,7 +656,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -680,7 +680,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -704,7 +704,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/uk/OrchardCore.Diagnostics.po b/Localization/uk/OrchardCore.Diagnostics.po
index 3f5ad3d5e0107..98cf65eb32c1c 100644
--- a/Localization/uk/OrchardCore.Diagnostics.po
+++ b/Localization/uk/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Ваш браузер надіслав запит, який сервер не розумів."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Виникла помилка під час виконання запиту."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Ви не маєте доступу до цього ресурсу."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Сторінка не зайдена."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "У вас немає прав на перегляд цього контенту."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/uk/OrchardCore.Email.Abstractions.po b/Localization/uk/OrchardCore.Email.Abstractions.po
index 8c83a11c64a4d..7dff3767015c5 100644
--- a/Localization/uk/OrchardCore.Email.Abstractions.po
+++ b/Localization/uk/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2022-03-05 10:53\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Поле {0} є обов'язковим."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Спосіб доставки '{0}' не підтримується."
diff --git a/Localization/uk/OrchardCore.Email.po b/Localization/uk/OrchardCore.Email.po
index 7b91251686c41..4d8e9c0a5b699 100644
--- a/Localization/uk/OrchardCore.Email.po
+++ b/Localization/uk/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Невдало"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Надіслати листа"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Налаштування"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Кому"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "Прихована копія"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "Копія"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Тема"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Текст"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Електронна адреса за замовчування для відправника, якщо не встановлено email відправника."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Ім'я користувача для автентифікації."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Наприклад, <i>C:\\Path\\T\\This\\Site\\PickedUpEmail</i>, щоб розмістити листи в каталозі <i>PickedUpEmail</i> на C диску."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/uk/OrchardCore.Facebook.po b/Localization/uk/OrchardCore.Facebook.po
index 31304edf0a72b..7d9326a0c2009 100644
--- a/Localization/uk/OrchardCore.Facebook.po
+++ b/Localization/uk/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Тіло FaceBook не містить дійсного виразу Liquid. Докладно: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Параметри входу"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/uk/OrchardCore.Features.po b/Localization/uk/OrchardCore.Features.po
index 1859f0e55632c..7cafdbf01bc42 100644
--- a/Localization/uk/OrchardCore.Features.po
+++ b/Localization/uk/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Можливості"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Будь ласка, виберіть одну або кілька функцій."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} — {1}."
@@ -125,9 +125,9 @@ msgstr "Масові дії"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Вимкнути"
@@ -136,8 +136,8 @@ msgstr "Вимкнути"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Увімкнути"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Без категорії"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Вимкнення функції {0} також відключить такі залежні функції:{1}Продовжити?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Вимкнення функції"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Так"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Ні"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Тут нічого!</strong> Ваш пошук не приніс результатів."
diff --git a/Localization/uk/OrchardCore.Flows.po b/Localization/uk/OrchardCore.Flows.po
index e7c2ec487eb7b..c3953ca4a17e3 100644
--- a/Localization/uk/OrchardCore.Flows.po
+++ b/Localization/uk/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Додати запис"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Вставити віджет"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Видалити"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Ви впевнені, що хочете видалити цей елемент?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/uk/OrchardCore.Forms.po b/Localization/uk/OrchardCore.Forms.po
index 360c8641ae432..3b71873c9c2b7 100644
--- a/Localization/uk/OrchardCore.Forms.po
+++ b/Localization/uk/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Вірний"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Невірний"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Перевірка"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Вірний"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Невірний"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/uk/OrchardCore.GitHub.po b/Localization/uk/OrchardCore.GitHub.po
index 362961767407f..20d9b57becef5 100644
--- a/Localization/uk/OrchardCore.GitHub.po
+++ b/Localization/uk/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Налаштування автентифікації на GitHub"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Ідентифікатор клієнта, який визначено на загальній вкладці вашого <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub додатку</a>."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Секрет вашої програми."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/uk/OrchardCore.Google.po b/Localization/uk/OrchardCore.Google.po
index 7cd36de645f81..41a2ab5d43a3f 100644
--- a/Localization/uk/OrchardCore.Google.po
+++ b/Localization/uk/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Налаштування Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/uk/OrchardCore.Html.po b/Localization/uk/OrchardCore.Html.po
index 53b5cecdb4ca2..ac695e55c01a9 100644
--- a/Localization/uk/OrchardCore.Html.po
+++ b/Localization/uk/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Візуальний редактор"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "Введіть налаштування редактора, мову завжди встановлено на `html` за збереженням."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документація по опціям"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Введіть параметри редактора"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Документація по опціям"
diff --git a/Localization/uk/OrchardCore.Https.po b/Localization/uk/OrchardCore.Https.po
index 42d852f13874f..ab45761bef7b5 100644
--- a/Localization/uk/OrchardCore.Https.po
+++ b/Localization/uk/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/uk/OrchardCore.Infrastructure.Abstractions.po b/Localization/uk/OrchardCore.Infrastructure.Abstractions.po
index 88733406f9307..608ae763ebfc0 100644
--- a/Localization/uk/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/uk/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2022-03-05 10:53\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/uk/OrchardCore.Layers.po b/Localization/uk/OrchardCore.Layers.po
index 9704fed15aada..e3b61b0b89182 100644
--- a/Localization/uk/OrchardCore.Layers.po
+++ b/Localization/uk/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Назва"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Опис"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Редагувати шар - {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Назва"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "Зберегти"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Додати віджет"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "Дивитися документацію"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Редагувати"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Видалити"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Додати"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/uk/OrchardCore.Liquid.po b/Localization/uk/OrchardCore.Liquid.po
index fb0f26c9409cd..16d09a7862efc 100644
--- a/Localization/uk/OrchardCore.Liquid.po
+++ b/Localization/uk/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Тіло Liquid не містить правильний Liquid вираз. Деталі: {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/uk/OrchardCore.Lists.po b/Localization/uk/OrchardCore.Lists.po
index 65a9e5ea8eb0f..4ed7eb75118c1 100644
--- a/Localization/uk/OrchardCore.Lists.po
+++ b/Localization/uk/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Список порожній"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Списки"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/uk/OrchardCore.Localization.po b/Localization/uk/OrchardCore.Localization.po
index c09d6ccbca7ed..676eb1b8401f5 100644
--- a/Localization/uk/OrchardCore.Localization.po
+++ b/Localization/uk/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Культура"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Необхідна культура"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Щоб ці параметри набули чинності – необхідно перезапустити програму."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Активні культури, налаштовані для сайту."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "Налаштування культури"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "Експорт налаштувань культури."
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Додати культуру"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/uk/OrchardCore.Markdown.po b/Localization/uk/OrchardCore.Markdown.po
index 15e043ccffddb..caa6f4bacaee2 100644
--- a/Localization/uk/OrchardCore.Markdown.po
+++ b/Localization/uk/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/uk/OrchardCore.Media.po b/Localization/uk/OrchardCore.Media.po
index 1c30f7f9fc107..046989dc30b00 100644
--- a/Localization/uk/OrchardCore.Media.po
+++ b/Localization/uk/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "За замовчуванням"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "Максимальний"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "Обрізати"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "Мін"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -774,7 +774,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Інвертувати"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1006,7 +1006,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Створити теку"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1034,7 +1034,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Перейменувати"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1064,13 +1064,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Медіа"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Всі"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1089,43 +1089,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1136,49 +1136,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Стандарт"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Гаразд"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1298,7 +1298,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/uk/OrchardCore.Menu.po b/Localization/uk/OrchardCore.Menu.po
index 2180a5435d0c2..7b23341d53a5a 100644
--- a/Localization/uk/OrchardCore.Menu.po
+++ b/Localization/uk/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Меню"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Елемент меню успішно видалений."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Редагувати {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Назва"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "Посилання"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Дивитися документацію"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Назва"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/uk/OrchardCore.Microsoft.Authentication.po b/Localization/uk/OrchardCore.Microsoft.Authentication.po
index 93200b0a309fd..742287e93f33d 100644
--- a/Localization/uk/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/uk/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/uk/OrchardCore.Navigation.po b/Localization/uk/OrchardCore.Navigation.po
index b506e679b1139..ac3f4d90661bb 100644
--- a/Localization/uk/OrchardCore.Navigation.po
+++ b/Localization/uk/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/uk/OrchardCore.Notifications.po b/Localization/uk/OrchardCore.Notifications.po
index 6072c8c179ba8..94cbbe13e27dc 100644
--- a/Localization/uk/OrchardCore.Notifications.po
+++ b/Localization/uk/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,10 +94,10 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
@@ -107,21 +107,21 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -147,15 +147,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
@@ -262,13 +262,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -330,13 +330,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -348,7 +348,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -360,7 +360,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -384,10 +384,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -410,7 +410,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -422,7 +422,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -458,38 +458,33 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
-
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/uk/OrchardCore.OpenId.po b/Localization/uk/OrchardCore.OpenId.po
index 9831d692473e2..e75af6bb960f1 100644
--- a/Localization/uk/OrchardCore.OpenId.po
+++ b/Localization/uk/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Конфігурація OpenID сервера успішно оновлена."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/uk/OrchardCore.Placements.po b/Localization/uk/OrchardCore.Placements.po
index 71e6834587bdc..b916ef617ac80 100644
--- a/Localization/uk/OrchardCore.Placements.po
+++ b/Localization/uk/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/uk/OrchardCore.ProjectTemplates.po b/Localization/uk/OrchardCore.ProjectTemplates.po
index 3af8331d7b945..126d4570589a6 100644
--- a/Localization/uk/OrchardCore.ProjectTemplates.po
+++ b/Localization/uk/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Показати"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/uk/OrchardCore.PublishLater.po b/Localization/uk/OrchardCore.PublishLater.po
index 64f5535f68772..e2b369cfce052 100644
--- a/Localization/uk/OrchardCore.PublishLater.po
+++ b/Localization/uk/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Опублікувати пізніше"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "Скасувати публікацію пізніше"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/uk/OrchardCore.Queries.po b/Localization/uk/OrchardCore.Queries.po
index 324ab91f58d8f..0db318732575a 100644
--- a/Localization/uk/OrchardCore.Queries.po
+++ b/Localization/uk/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -364,7 +364,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -412,7 +412,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -468,7 +468,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -480,7 +480,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -534,7 +534,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/uk/OrchardCore.ReCaptcha.Core.po b/Localization/uk/OrchardCore.ReCaptcha.Core.po
index b08c2e36f79cd..331f602c84bf0 100644
--- a/Localization/uk/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/uk/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Не вдалося підтвердити captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Не вдалося підтвердити captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Мову з назвою {0} не знайдено"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/uk/OrchardCore.ReCaptcha.po b/Localization/uk/OrchardCore.ReCaptcha.po
index 9e5c256b0ce84..9e6e201e11c8d 100644
--- a/Localization/uk/OrchardCore.ReCaptcha.po
+++ b/Localization/uk/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Вірний"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Неприпустимий"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/uk/OrchardCore.Recipes.Core.po b/Localization/uk/OrchardCore.Recipes.Core.po
index 85431fe664638..b08f0f102c1cd 100644
--- a/Localization/uk/OrchardCore.Recipes.Core.po
+++ b/Localization/uk/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2022-10-11 20:39\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/uk/OrchardCore.Roles.po b/Localization/uk/OrchardCore.Roles.po
index 68effadeab747..5e383d155a273 100644
--- a/Localization/uk/OrchardCore.Roles.po
+++ b/Localization/uk/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr ""
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr ""
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/uk/OrchardCore.Rules.po b/Localization/uk/OrchardCore.Rules.po
index 7b3674e0a58f3..ff5e1d0ed50f7 100644
--- a/Localization/uk/OrchardCore.Rules.po
+++ b/Localization/uk/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-17 16:59\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/uk/OrchardCore.Search.Elasticsearch.po b/Localization/uk/OrchardCore.Search.Elasticsearch.po
index d241004256ba6..5764bc3408cef 100644
--- a/Localization/uk/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/uk/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -814,7 +850,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -856,7 +892,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -868,7 +904,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -886,7 +922,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/uk/OrchardCore.Search.Lucene.po b/Localization/uk/OrchardCore.Search.Lucene.po
index 1f4bd6f02399d..e9789b6b22cad 100644
--- a/Localization/uk/OrchardCore.Search.Lucene.po
+++ b/Localization/uk/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -524,13 +524,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -572,13 +572,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -620,13 +620,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -692,7 +692,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -716,7 +716,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -806,7 +806,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -818,7 +818,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -867,7 +867,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/uk/OrchardCore.Search.po b/Localization/uk/OrchardCore.Search.po
index 09bbcf2e7d1a4..d35c5b5758e57 100644
--- a/Localization/uk/OrchardCore.Search.po
+++ b/Localization/uk/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/uk/OrchardCore.Security.po b/Localization/uk/OrchardCore.Security.po
index 854b0c354b5d9..c3b5dda666b3d 100644
--- a/Localization/uk/OrchardCore.Security.po
+++ b/Localization/uk/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2022-06-01 18:43\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/uk/OrchardCore.Seo.po b/Localization/uk/OrchardCore.Seo.po
index d4ba58b9f43f9..38a50daf1b8d4 100644
--- a/Localization/uk/OrchardCore.Seo.po
+++ b/Localization/uk/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Змінити дані"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/uk/OrchardCore.Settings.po b/Localization/uk/OrchardCore.Settings.po
index d6de7010c30e0..d56205e580789 100644
--- a/Localization/uk/OrchardCore.Settings.po
+++ b/Localization/uk/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Налаштування успішно оновлено."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Налаштування сайту"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/uk/OrchardCore.Setup.Core.po b/Localization/uk/OrchardCore.Setup.Core.po
index 601db19823ede..907c9910a7e00 100644
--- a/Localization/uk/OrchardCore.Setup.Core.po
+++ b/Localization/uk/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/uk/OrchardCore.Setup.po b/Localization/uk/OrchardCore.Setup.po
index 9e3aa6f4b2ba7..ad8f11e0b614b 100644
--- a/Localization/uk/OrchardCore.Setup.po
+++ b/Localization/uk/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Пароль повинен містити принаймні {0}."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr ""
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "База даних використовується для зберігання конфігурації сайту і його вмісту."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Ви можете вказати префікс таблиць, якщо хочете повторно використати ту саму базу даних для декількох сайтів."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Показати/приховати рядок підключення"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Супер користувач має всі права. Він може бути використаний тільки під час інсталяції та критичного відновлення."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Електронна адреса недійсна."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Надійність пароля"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/uk/OrchardCore.Shortcodes.po b/Localization/uk/OrchardCore.Shortcodes.po
index c24dd1aae5a97..9ff5f8c715f5a 100644
--- a/Localization/uk/OrchardCore.Shortcodes.po
+++ b/Localization/uk/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/uk/OrchardCore.Sitemaps.po b/Localization/uk/OrchardCore.Sitemaps.po
index 7ae7e078215ca..c84e8a9740e52 100644
--- a/Localization/uk/OrchardCore.Sitemaps.po
+++ b/Localization/uk/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1040,7 +1040,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/uk/OrchardCore.Sms.po b/Localization/uk/OrchardCore.Sms.po
index 3afd3bfc6b705..e7c4936632efc 100644
--- a/Localization/uk/OrchardCore.Sms.po
+++ b/Localization/uk/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/uk/OrchardCore.Spatial.po b/Localization/uk/OrchardCore.Spatial.po
index 98f1678a8bca5..224c943720b5c 100644
--- a/Localization/uk/OrchardCore.Spatial.po
+++ b/Localization/uk/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "Редактор Leaflet"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Чи обов'язкове значення."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/uk/OrchardCore.Taxonomies.po b/Localization/uk/OrchardCore.Taxonomies.po
index a98609210d597..d463850195a57 100644
--- a/Localization/uk/OrchardCore.Taxonomies.po
+++ b/Localization/uk/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Необхідно значення для '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "Фільтри таксономії"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "Мітки"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Таксономія не знайдена. Будь ласка, перевірте параметри для цього поля."
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "Помилка створення мітки"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Введіть для пошуку"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Обрати"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Видалити"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "Натисніть Enter, щоб створити мітку"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "Не знайдено жодного мітки"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "Мітки"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Таксономія не знайдена. Будь ласка, перевірте параметри для цього поля."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Текст підказки, який буде показано для цього поля в редакторі."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Таксономія"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Обов’язково"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Чи вибрано принаймні один елемент."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Унікальний"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "Чи можна вибрати тільки один елемент."
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "Чи можна створювати нові мітки. Примітка: при створенні міток буде встановлено тільки властивість відображення в тексті."
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr ""
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Додати {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Ви перевпорядкували таксономію."
diff --git a/Localization/uk/OrchardCore.Templates.Cms.Module.po b/Localization/uk/OrchardCore.Templates.Cms.Module.po
index 91662edc42389..c6813fc43bce5 100644
--- a/Localization/uk/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/uk/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Показати"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/uk/OrchardCore.Templates.po b/Localization/uk/OrchardCore.Templates.po
index 86451aefb55d1..d96806d3e2443 100644
--- a/Localization/uk/OrchardCore.Templates.po
+++ b/Localization/uk/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Шаблон \"{0}\" створено."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Шаблон успішно видалено."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Шаблони успішно видалені."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "Всі шаблони"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Перегляд"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Назва шаблону."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Опис шаблону."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Перегляд"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Назва шаблону."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Опис шаблону."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/uk/OrchardCore.Tenants.po b/Localization/uk/OrchardCore.Tenants.po
index c458f877c7ed4..b1be530e3d727 100644
--- a/Localization/uk/OrchardCore.Tenants.po
+++ b/Localization/uk/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Екземпляр"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Всі статуси"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Виконується"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Вимкнено"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Не ініціалізовано"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Назва"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Стан"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Відключити"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Увімкнути"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Ви не можете вимкнути екземпляр за замовчуванням."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Екземпляр '{0}' уже вимкнений."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Екземпляр '{0}' вже включенний."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Ви можете увімкнути тільки вимкнений екземпляр."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "Ім’я користувача '{0}' є неприпустимим, може містити тільки букви або цифри."
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "Email некоректний."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Екземпляр не знайдений: {0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Екземпляр не може бути налаштований."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Постачальник баз даних не визначений."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Рядок підключення є обов'язковим для цього постачальника бази даних."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Або 'Recipe' або 'RecipeName' обов'язкові."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Пресет '{0}' не знайдений."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Створити екземпляр"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Створити екземпляр"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Виберіть назву екземпляра для створення."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Префікс таблиці"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Рядок підключення"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "Пресет"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Вимкнути екземпляр"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Редагувати екземпляр"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Увімкнути екземпляр"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Увімкнути екземпляр."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1234,8 +1228,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Конструювати"
@@ -1252,7 +1246,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Встановити екземпляр"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1264,49 +1258,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Виберіть ім'я власника для встановлення."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Назва сайту"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Ім'я адміністратора"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Електронна адреса адміністратора"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Пароль адміністратора"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Який тип бази даних використовувати?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Префікс таблиці"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Рядок підключення"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1324,7 +1318,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/uk/OrchardCore.Tests.po b/Localization/uk/OrchardCore.Tests.po
index 98a08ce0f7fc7..382fbb1a52653 100644
--- a/Localization/uk/OrchardCore.Tests.po
+++ b/Localization/uk/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/uk/OrchardCore.Themes.po b/Localization/uk/OrchardCore.Themes.po
index faaa86a0cc150..e6cd66d403336 100644
--- a/Localization/uk/OrchardCore.Themes.po
+++ b/Localization/uk/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/uk/OrchardCore.Title.po b/Localization/uk/OrchardCore.Title.po
index 45f022f4ffb5a..5ea6a209a9dec 100644
--- a/Localization/uk/OrchardCore.Title.po
+++ b/Localization/uk/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Для Заголовка значення є обов' язкове."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Шаблон не містить дійсного виразу Liquid. Деталі: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Заголовок буде автоматично згенеровано за допомогою шаблону."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Стандартний"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Відмітьте, щоб відобразити заголовок у вигляді відображення."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/uk/OrchardCore.Twitter.po b/Localization/uk/OrchardCore.Twitter.po
index a9f892ba6ccab..ca2874ee6a5a9 100644
--- a/Localization/uk/OrchardCore.Twitter.po
+++ b/Localization/uk/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Невдало"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Дивитися документацію"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Налаштування інтеграції з Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Ключ API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "Токени доступу"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/uk/OrchardCore.Users.Core.po b/Localization/uk/OrchardCore.Users.Core.po
index 4420bd230bc9a..2204ae4c07b64 100644
--- a/Localization/uk/OrchardCore.Users.Core.po
+++ b/Localization/uk/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Електронна адреса '{0}' недійсна."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Несподівана помилка: '{0}'."
diff --git a/Localization/uk/OrchardCore.Users.po b/Localization/uk/OrchardCore.Users.po
index b3025c83ed44f..b8d826707796e 100644
--- a/Localization/uk/OrchardCore.Users.po
+++ b/Localization/uk/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Користувач успішно створений"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Локальний вхід вимкнено."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Некоректна спроба входу."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Сайт не дозволяє реєстрацію користувачів."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Підтвердіть свій обліковий запис"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Ви повинні підтвердити свою електронну пошту."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Усі користувачі"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Назва"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Схвалити"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Увімкнути"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Відключити"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Видалити"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Всі ролі"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Користувач {0} успішно затверджений."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Користувач {0} успішно видалений."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Користувача {0} успішно відключено."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Користувач {0} успішно увімкнений."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Пароль успішно оновлено."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Параметри входу"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Налаштування реєстрації"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Скинути налаштування паролів"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Дати користувачу ролі"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Користувач"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Невдало"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Вірний"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Невірний"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr ""
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Користувач"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Анонім"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Поточний пароль"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Новий пароль"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Створити користувача"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Редагувати пароль"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Новий пароль"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Будь ласка, перевірте свою електронну пошту для скидання пароля."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Ви успішно авторизувалися на сайті <strong>{0}</strong>. У вас вже є обліковий запис з цією адресою електронної пошти. Введіть пароль свого локального облікового запису та натисніть кнопку \"Зареєструвати\", щоб прив'язати облікові записи та закінчити вхід."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "Електронна пошта"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Ввійти"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Для входу скористайтеся іншою службою"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Створити новий акаунт."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "Електронна пошта"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Пароль"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Ви успішно виконали вхід до <strong>{0}</strong>. Будь ласка, заповніть форму нижче і натисніть кнопку Зареєструватися, щоб завершити реєстрацію."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "Електронна пошта"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Пароль"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Відновити пароль"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "Електронна пошта"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Новий пароль"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Користувач вимкнений."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Користувач включений."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Зніміть позначку, щоб вимкнути цей обліковий запис користувача."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3356,7 +3428,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3422,7 +3494,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3446,16 +3518,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/uk/OrchardCore.Widgets.po b/Localization/uk/OrchardCore.Widgets.po
index a484908464a53..d9e7714e41772 100644
--- a/Localization/uk/OrchardCore.Widgets.po
+++ b/Localization/uk/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Додати віджет"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/uk/OrchardCore.Workflows.po b/Localization/uk/OrchardCore.Workflows.po
index e0d93d0949028..3d473aef1cbc5 100644
--- a/Localization/uk/OrchardCore.Workflows.po
+++ b/Localization/uk/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Сесія"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Готово"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Вірний"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Невірний"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Для кожної задачі"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Контролювати потік"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Контролювати потік"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Якщо інше завдання"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "True"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "False"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Приєднатися до завдання"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Приєднаний"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Журнал завдання"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Готово"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr ""
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Готово"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Завершено"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Видалити"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Видалити"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Готово"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Готово"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Готово"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Стартова завдання"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Редагувати"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Додати"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Назад"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Видалити"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Доступні події"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Доступні завдання"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Ви впевнені, що бажаєте видалити цю діяльність?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Фільтр"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Додаткові налаштування"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Без відгалужень"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr ""
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr ""
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr ""
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr ""
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Постійний"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr ""
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr ""
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr ""
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr ""
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr ""
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr ""
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr ""
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr ""
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr ""
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr ""
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr ""
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr ""
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1710,40 +1774,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Сортувати"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Видалити"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Створений: {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Тут пусто!</strong> На даний момент шаблонів немає."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Назад"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "вибрано"
@@ -1846,15 +1924,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 екземпляр"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1888,7 +1962,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr ""
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1918,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Журнал"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1930,7 +2004,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr ""
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1978,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr ""
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1990,7 +2064,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr ""
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2020,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "Скрипт"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2032,7 +2106,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2062,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr ""
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2074,7 +2148,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Назва для виводу."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2104,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr ""
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2116,7 +2190,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2152,7 +2226,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr ""
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2188,7 +2262,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2242,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr ""
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2254,7 +2328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2290,7 +2364,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr ""
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2314,3 +2388,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr ""
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/uk/TheAdmin.po b/Localization/uk/TheAdmin.po
index 8fa8d62d4ed7c..ccb066ae69ce4 100644
--- a/Localization/uk/TheAdmin.po
+++ b/Localization/uk/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Світлий режим"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Темний режим"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Відвідати сайт"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Згорнути / розгорнути меню"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Видалити"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Ви дійсно бажаєте видалити цей елемент?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Гаразд"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Скасувати"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/uk/TheAgencyTheme.po b/Localization/uk/TheAgencyTheme.po
index ec2f7c0d61add..cec2bd880484c 100644
--- a/Localization/uk/TheAgencyTheme.po
+++ b/Localization/uk/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Нема результатів."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Сторінку не знайдено"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Сторінку, яку ви шукали, не вдалося знайти."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/uk/TheBlogTheme.po b/Localization/uk/TheBlogTheme.po
index a0724b17c3189..b2de2dd85f544 100644
--- a/Localization/uk/TheBlogTheme.po
+++ b/Localization/uk/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "на {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Нема результатів."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Сторінку не знайдено"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/uk/TheTheme.po b/Localization/uk/TheTheme.po
index d881bc1e44b38..f06e3f29db9b7 100644
--- a/Localization/uk/TheTheme.po
+++ b/Localization/uk/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,55 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/vi/OrchardCore.Admin.po b/Localization/vi/OrchardCore.Admin.po
index f63aac36b0c02..df230d1c1352e 100644
--- a/Localization/vi/OrchardCore.Admin.po
+++ b/Localization/vi/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "Quản trị"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "Cài đặt quản trị"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "Xuất ra phần cài đặt quản trị."
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "Chào mừng đến với Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "Hãy duyệt menu và khám phá tất cả những chức năng."
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "Kích hoạt giao diện quản trị nền tối"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "Có thể hiển thị trang quản trị ở chế độ tối mầu."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "Cho hiển thị tiêu đề ở vị trí trên cùng."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "Quản trị"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/vi/OrchardCore.AdminDashboard.po b/Localization/vi/OrchardCore.AdminDashboard.po
index e66727dbf4862..e5d0b0293f24c 100644
--- a/Localization/vi/OrchardCore.AdminDashboard.po
+++ b/Localization/vi/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "Không"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "Vị trí"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "Chiều rộng"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/vi/OrchardCore.AdminMenu.po b/Localization/vi/OrchardCore.AdminMenu.po
index 29338eb6079b2..b26421a7a0c8d 100644
--- a/Localization/vi/OrchardCore.AdminMenu.po
+++ b/Localization/vi/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "Tạo Menu Quản trị {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "Tên"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "Tạo nút"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "Sửa Menu Quản trị: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "Sửa Nút"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "Ưu tiên của liên kết này sẽ được hiển thị là hoạt động thay vì liên kết khác khi cả hai đều trỏ đến cùng một url. Liên kết có giá trị cao nhất có trạng thái hoạt động trong điều hướng."
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "Thứ tự vị trí của liên kết này trong menu quản trị."
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "Liên kết"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "Văn bản Liên kết sẽ được hiển thị trong cây."
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "Url của liên kết. Một liên kết sẽ được hiển thị chỉ khi nó có một url. Url sẽ tương đối so với thư mục gốc của trang quản trị"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Chọn biểu tượng"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "Giữ chỗ"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "Phần văn bản của một mục menu sẽ được hiển thị trong cây."
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr "Chọn"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "Chọn một biểu tượng để hiển thị khi mục này đứng đầu."
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Chọn biểu tượng"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "Phân quyền"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "Nhập để tìm kiếm"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "Chọn"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "Không tìm thấy kết quả nào"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "Các quyền cần thiết để hiển thị mục menu này (tùy chọn)."
diff --git a/Localization/vi/OrchardCore.Alias.po b/Localization/vi/OrchardCore.Alias.po
index bb916c1d6fea5..c4fbb6dcac0f8 100644
--- a/Localization/vi/OrchardCore.Alias.po
+++ b/Localization/vi/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mẫu không chứa biểu thức Liquid hợp lệ. Chi tiết: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "Để trống để tạo lại nó."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "Bí danh đã được tạo và đầu vào bị vô hiệu hóa"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/vi/OrchardCore.ArchiveLater.po b/Localization/vi/OrchardCore.ArchiveLater.po
index d1e8ae5852f7d..f0e9382645ff9 100644
--- a/Localization/vi/OrchardCore.ArchiveLater.po
+++ b/Localization/vi/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/vi/OrchardCore.AuditTrail.po b/Localization/vi/OrchardCore.AuditTrail.po
index 28a9371971a9e..4a7b223ff1d9b 100644
--- a/Localization/vi/OrchardCore.AuditTrail.po
+++ b/Localization/vi/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "Lịch sử hoạt động"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "Tất cả các danh mục"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "Phạm vi thời gian tùy chỉnh"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "Lịch sử hoạt động"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "Số ngày một sự kiện được giữ lại."
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/vi/OrchardCore.Autoroute.po b/Localization/vi/OrchardCore.Autoroute.po
index fbc461b21dfb6..60488dd3e9c57 100644
--- a/Localization/vi/OrchardCore.Autoroute.po
+++ b/Localization/vi/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/vi/OrchardCore.BackgroundTasks.po b/Localization/vi/OrchardCore.BackgroundTasks.po
index 4dabd01dbe9ea..38df69bef73dd 100644
--- a/Localization/vi/OrchardCore.BackgroundTasks.po
+++ b/Localization/vi/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/vi/OrchardCore.ContentFields.po b/Localization/vi/OrchardCore.ContentFields.po
index 6111e236f41f0..2862deae4c639 100644
--- a/Localization/vi/OrchardCore.ContentFields.po
+++ b/Localization/vi/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "Chuyển"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "Không có mục nội dung."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "Tiêu chuẩn"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "Chưa xuất bản"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Nhập để tìm kiếm"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "Chọn"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "Không tìm thấy kết quả nào"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Có cho phép nhiều yếu tố được chọn."
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "Hiện Tất cả Loại Nội dung"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "Các loại nội dung để hiển thị. Chọn ít nhất một."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "Bản địa hóa"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Trình soạn thảo Trực quan"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Tài liệu cho các tùy chọn"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Tài liệu cho các tùy chọn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "Văn bản Liên kết"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "Có thể bắt buộc một url."
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "Sử dụng url của liên kết"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho văn bản của liên kết trên trình chỉnh sửa."
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "Một gợi ý (placeholder) để hiển thị khi để trống url."
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "Một gợi ý (placeholder) để hiển thị khi để trống url."
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "Một url hợp lệ được đề nghị sau khi khởi tạo một mục nội dung."
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "Không có mục nội dung."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "Tiêu chuẩn"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "Chưa phát hành"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "Nhập để tìm kiếm"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "Chọn"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "Không tìm thấy kết quả nào"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Cho phép chọn nhiều yếu tố."
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "Những loại nội dung để hiển thị. Chọn ít nhất một."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "Nhập để tìm kiếm"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "Chọn"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "Không tìm thấy giá trị nào"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "Sửa Dữ liệu"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Một biểu diễn JSON của các giá trị được phép, ví dụ: {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "Phạm vi"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "Không"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "Quay"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "Một gợi ý để hiển thị khi không nhập. (tùy chọn)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "Số các chữ số sau dấu thập phân."
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "Giá trị tối thiểu cho phép. (tùy chọn)"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "Giá trị tối đa cho phép. (tùy chọn)"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "Nhập các tùy chọn trình soạn thảo."
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "Tài liệu cho các tùy chọn"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "Sửa Dữ liệu"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "Một biểu diễn JSON của các giá trị được phép, ví dụ: {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "Không kích hoạt"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "Nhập để tìm kiếm"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "Chọn"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "Không tìm thấy kết quả nào"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "Có cho phép nhiều yếu tố được chọn."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Gợi ý để hiển thị cho trường này trên trình soạn thảo."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "Yêu cầu"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "Gợi ý"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Văn bản gợi ý để hiển thị cho trường này trên trình chỉnh sửa."
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "Chiều rộng"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Chiều rộng của Videobox"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "Chiều cao"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Chiều cao của Videobox"
diff --git a/Localization/vi/OrchardCore.ContentLocalization.po b/Localization/vi/OrchardCore.ContentLocalization.po
index 7c07e323da91c..29da690cae758 100644
--- a/Localization/vi/OrchardCore.ContentLocalization.po
+++ b/Localization/vi/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/vi/OrchardCore.ContentPreview.po b/Localization/vi/OrchardCore.ContentPreview.po
index 2a52befac6550..3e2740fdda47c 100644
--- a/Localization/vi/OrchardCore.ContentPreview.po
+++ b/Localization/vi/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mẫu không chứa biểu thức Liquid hợp lệ. Chi tiết: {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "Xem trước"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "Đã ngắt kết nối xem trước"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "Lỗi trong khi xem trước"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/vi/OrchardCore.ContentTypes.po b/Localization/vi/OrchardCore.ContentTypes.po
index 7e1f6dc65615b..bd1441769efd4 100644
--- a/Localization/vi/OrchardCore.ContentTypes.po
+++ b/Localization/vi/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "Phần Nội dung"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "Tên Hiển thị không thể để trống."
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "Đã có một loại sử dụng Tên Hiển thị này."
@@ -66,10 +66,10 @@ msgstr "Đã có một loại sử dụng Tên Hiển thị này."
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "Tên Kỹ thuật không được để trống."
@@ -78,10 +78,10 @@ msgstr "Tên Kỹ thuật không được để trống."
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "Tên Kỹ thuật phải bắt đầu bằng một chữ cái."
@@ -90,10 +90,10 @@ msgstr "Tên Kỹ thuật phải bắt đầu bằng một chữ cái."
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "Tên Kỹ thuật chứa các ký tự không hợp lệ."
@@ -101,133 +101,133 @@ msgstr "Tên Kỹ thuật chứa các ký tự không hợp lệ."
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "Đã có một loại sử dụng Tên Kỹ thuật này."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "Đã tạo \"{0}\" loại nội dung."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "\"{0}\" cài đặt đã được lưu."
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" đã loại bỏ."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "\"{0}\" phần được thêm vào."
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "Đã có một phần cùng Tên Hiển thị này."
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "Đã có một phần cùng Tên Kỹ thuật này."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "\"{0}\" phần được loại bỏ."
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "Phần nội dung không được tạo."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "\"{0}\" phần nội dung đã được tạo."
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "Cài đặt \"{0}\" đã được lưu."
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "Một trường có cùng Tên Hiển thị đã tồn tại."
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "Đã có một trường cùng Tên Kỹ thuật này."
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "Trường \"{0}\" đã được thêm vào."
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "Tên hiển thị đã đổi thành {0}."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "\"{0}\" trường cài đặt đã được lưu."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "\"{0}\" trường cài đặt đã bị loại bỏ."
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "\"{0}\" cài đặt đã được lưu."
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "Tên Loại Nội dung không được để trống."
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "Không thể sử dụng tên '{0}'. Nó đã được sử dụng."
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "Thêm Trường Mới Vào \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Tên của trường sẽ được hiển thị trên màn hình."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "Thêm Phần đã đặt tên Vào \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "Tên của phần có thể tái sử dụng sẽ được hiển thị trên màn hình."
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "Tên kỹ thuật của phần có thể tái sử dụng."
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "Tên của phần sẽ được hiển thị trên màn hình. Để trống để sử dụng mặc định."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "Đánh dấu để cho phép phần này được gắn vào nhiều lần."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Tên của loại sẽ được hiển thị trên màn hình."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "Loại Nội dung Mới"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "Tên của loại sẽ được hiển thị trên màn hình."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "Phần Nội dung Mới"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "Tạo"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "Sửa Loại Nội dung - {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "Các Trường"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "Sửa"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "Thêm Trường"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "Các Phần"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "Bao gồm các trường cho loại hiện tại"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "Thêm Phần"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "Thêm Phần đã đặt tên"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "Lưu"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "Xóa"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "\"{0}\" cài đặt cho \"{1}\""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "Tên của trường sẽ được hiển thị trên màn hình."
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "Tên kỹ thuật của trường."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "Nên sử dụng loại trình soạn thảo nào?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "Nên sử dụng loại chế độ hiển thị nào?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "Lưu"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "Bỏ qua"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "Một số cài đặt phần phổ biến cho tất cả các loại cũng có thể được xác định ở mức <a href=\"{0}\"> Định nghĩa Phần </a>."
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "Tên của phần sẽ được hiển thị trên màn hình."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "Mô tả của một phần sẽ được hiển thị trên màn hình."
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "Nên sử dụng loại trình soạn thảo nào?"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "Nên sử dụng loại chế độ hiển thị nào?"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "Lưu"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "Bỏ qua"
diff --git a/Localization/vi/OrchardCore.Contents.po b/Localization/vi/OrchardCore.Contents.po
index b41990f2825a5..78fbe52caf8ee 100644
--- a/Localization/vi/OrchardCore.Contents.po
+++ b/Localization/vi/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} đã bị thu hồi."
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "Tất cả loại nội dung"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "Nội dung"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "Hoàn thành"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "Lịch sử hoạt động"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "Ngày nội dung được tạo hoặc lần đầu được phát hành."
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "và tiếp tục"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "Các thao tác"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bất kì loại nội dung nào"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bất kì loại nội dung nào"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "Nội dung"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bất kì loại nội dung nào"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "Hiện Tất cả Loại Nội dung"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "Chọn một biểu tượng"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "Hiện tất cả Loại Nội dung"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "Giới hạn số lượng mục nội dung cần cung cấp từ nguồn này. Lưu ý: Chỉ có một loại nội dung được chọn khi tùy chọn này được chọn."
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bất kì loại nội dung nào"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bất kỳ loại nội dung nào"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "Bất kỳ loại nội dung nào"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "Tạo Nội dung"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "Đánh dấu nếu bạn muốn mục nội dung được phát hành ngay khi tạo xong. Bỏ đánh dấu để tạo bản nháp."
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "Xóa nội dung bằng cách sử dụng biểu thức: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "Xem Bản Nháp dưới dạng JSON"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "Tải Bản Nháp dưới dạng JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "Xem dưới dạng JSON"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "Nội dung"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "Mới"
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "Phát hành nội dung bằng cách sử dụng biểu thức: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "Khôi phục nội dung bằng cách sử dụng biểu thức: <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "Thu hồi nội dung bằng cách sử dụng biểu thức: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/vi/OrchardCore.CustomSettings.po b/Localization/vi/OrchardCore.CustomSettings.po
index 0e82a990beffc..2c27cd2a57be4 100644
--- a/Localization/vi/OrchardCore.CustomSettings.po
+++ b/Localization/vi/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "Cài đặt Tùy chỉnh"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/vi/OrchardCore.Data.YesSql.po b/Localization/vi/OrchardCore.Data.YesSql.po
index 82c0212de9162..c57a131616a28 100644
--- a/Localization/vi/OrchardCore.Data.YesSql.po
+++ b/Localization/vi/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/vi/OrchardCore.Demo.po b/Localization/vi/OrchardCore.Demo.po
index 434aebe4d5b30..ec4abb3f6720b 100644
--- a/Localization/vi/OrchardCore.Demo.po
+++ b/Localization/vi/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "Tên"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "Họ"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/vi/OrchardCore.Deployment.Remote.po b/Localization/vi/OrchardCore.Deployment.Remote.po
index 3b35a9f5571df..d0e9fde6c4867 100644
--- a/Localization/vi/OrchardCore.Deployment.Remote.po
+++ b/Localization/vi/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "Gửi kế hoạch triển khai để cài đặt từ xa."
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "Tên Khách hàng"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "Tạo Phiên bản Ở xa"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "Tên Khách hàng"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "Chỉnh sửa Khách hàng Ở xa"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "Tên Khách hàng"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "Sửa Phiên bản Ở xa"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "Tên Khách hàng"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/vi/OrchardCore.Deployment.po b/Localization/vi/OrchardCore.Deployment.po
index 9184819ee6ce8..2b426384852b3 100644
--- a/Localization/vi/OrchardCore.Deployment.po
+++ b/Localization/vi/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "Nhập JSON"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "Xoá"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "Kế hoạch triển khai đã được xóa thành công."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "Tên bắt buộc phải có."
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "Kế hoạch triển khai được cập nhật thành công."
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "Kế hoạch triển khai đã được xoá."
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "Tạo Kế hoạch Triển khai"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "Tệp tùy chỉnh để thêm vào làm một phần của kế hoạch."
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "Tên tệp sẽ được thêm vào lưu trữ."
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "Kế hoạch Triển khai"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "Sửa Kế hoạch Triển khai"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/vi/OrchardCore.Diagnostics.po b/Localization/vi/OrchardCore.Diagnostics.po
index eda2c3f03461d..2193c63db0dbd 100644
--- a/Localization/vi/OrchardCore.Diagnostics.po
+++ b/Localization/vi/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "Trình duyệt của bạn đã gửi một yêu cầu mà máy chủ này không thể hiểu được."
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "Đã có lỗi xảy ra trong khi thực thi yêu cầu này."
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "Bạn không có quyền truy cập đến tài nguyên này."
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "Trang này không được tìm thấy."
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "Bạn không được phép xem nội dung này."
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/vi/OrchardCore.Email.Abstractions.po b/Localization/vi/OrchardCore.Email.Abstractions.po
index 53a738c5f865e..bd44bcfa8bdcf 100644
--- a/Localization/vi/OrchardCore.Email.Abstractions.po
+++ b/Localization/vi/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2022-03-05 10:54\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "Trường {0} là bắt buộc."
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "Phương thức phân phối '{0}' không được hỗ trợ."
diff --git a/Localization/vi/OrchardCore.Email.po b/Localization/vi/OrchardCore.Email.po
index a624d3a35103a..32543a535e24d 100644
--- a/Localization/vi/OrchardCore.Email.po
+++ b/Localization/vi/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr "Email không hợp lệ."
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "Tác vụ Email"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "Gửi thư"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "Xong"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "Thất bại"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "Gửi Email"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "Địa chỉ email của tác giả xác định ai là người gửi email. Để trống để sử dụng địa chỉ email được định cấu hình. Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "Địa chỉ email của người gửi. Bắt buộc nếu không giống với địa chỉ email \"Từ\". Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "Địa chỉ email \"trả lời\". Bắt buộc nếu bạn muốn gửi email trả lời đến một địa chỉ khác với địa chỉ \"Từ\". Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "Danh sách địa chỉ người nhận được ngăn cách bởi dấy phấy. Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "Danh sách các địa chỉ email bản sao được phân tách bằng dấu phẩy. Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "Danh sách địa chỉ người nhận được ngăn cách bởi dấy phấy. Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "Nếu được chọn, phần nội dung của email sẽ được gửi dưới dạng HTML."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "Cài đặt"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "Tới"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "Người gửi là tùy chọn, nó hữu ích khi tác giả email khác với người gửi email."
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "Trả lời"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "Tiêu đề"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "Nội dung"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Trang web hiện tại sẽ được tải lại sau khi các cài đặt được lưu."
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "Địa chỉ email mặc định để sử dụng làm người gửi, trừ khi người gửi email được đặt."
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "Gửi email"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "Tên miền máy chủ SMTP, ví dụ: <i>smtp.gmail.com</i>."
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "Cổng máy chủ SMTP, mặc định là 25."
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "Máy chủ proxy là tùy chọn."
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "Cổng proxy là tùy chọn."
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "Khi tùy chọn này được chọn, nhóm ứng dụng hoặc nhận dạng quy trình máy chủ được sử dụng để xác thực với máy chủ mail."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "Tên đăng nhập để xác thực."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "Thư mục lưu email gửi đi"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "Ví dụ. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> để lưu email trong thư mục <i>PickedUpEmail</i> trên ổ đĩa C."
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/vi/OrchardCore.Facebook.po b/Localization/vi/OrchardCore.Facebook.po
index 3604cd69c0647..86aa80e754203 100644
--- a/Localization/vi/OrchardCore.Facebook.po
+++ b/Localization/vi/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "FaceBook Body không chứa biểu thức Liquid hợp lệ. Chi tiết: {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Body không chứa biểu thức Liquid hợp lệ. Chi tiết: {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "Cài đặt Đăng nhập"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Đường dẫn yêu cầu trong đường dẫn cơ sở của ứng dụng nơi tác nhân người dùng sẽ được trả về. Phần mềm trung gian sẽ xử lý yêu cầu này khi nó đến."
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "Template của plugin, có định dạng Liquid."
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Phiên bản SDK Javascript"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "Chạy trên mỗi trang"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/vi/OrchardCore.Features.po b/Localization/vi/OrchardCore.Features.po
index 7fa362f81631e..4ffd9cf05edb9 100644
--- a/Localization/vi/OrchardCore.Features.po
+++ b/Localization/vi/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "Tính năng"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "Vui lòng chọn một hoặc nhiều tính năng."
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} là {1}."
@@ -125,9 +125,9 @@ msgstr "Loạt Hành động"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "Vô hiệu hoá"
@@ -136,8 +136,8 @@ msgstr "Vô hiệu hoá"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "Kích hoạt"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "Chưa phân loại"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "Tính năng này được bật tự động dựa trên sự phụ thuộc và không thể tắt theo cách thủ công."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "Tính năng này tự động bị tắt dựa trên sự phụ thuộc và không thể bật thủ công."
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "Tính năng này luôn được bật và không thể tắt theo cách thủ công."
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "Vô hiệu hóa tính năng {0} sẽ cũng vô hiệu hóa các tính năng phụ thuộc sau: {1}Tiếp tục?"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "Vô hiệu hóa Tính năng"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "Đồng ý"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "Không"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>Không có kết quả!</strong> Tìm kiếm của bạn không có kết quả."
diff --git a/Localization/vi/OrchardCore.Flows.po b/Localization/vi/OrchardCore.Flows.po
index 3c9721f7967cc..a49a3571a1220 100644
--- a/Localization/vi/OrchardCore.Flows.po
+++ b/Localization/vi/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "Thêm mục"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "Các loại nội dung mà túi này có thể chứa, ví dụ: một hình cho Slide Show."
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "Chèn Tiện ích"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "Xóa"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "Bạn có chắc chắn muốn xóa mục này không?"
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "Không tìm thấy các tiện ích."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/vi/OrchardCore.Forms.po b/Localization/vi/OrchardCore.Forms.po
index 1f6363f8c14b0..cf8ee0c9933e6 100644
--- a/Localization/vi/OrchardCore.Forms.po
+++ b/Localization/vi/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "Các tùy chọn được viết với một định dạng không chính xác."
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "Thêm Tác vụ Lỗi Xác thực Mô hình"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "Xác nhận"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "Tác vụ Bind Model State"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "Xác nhận"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "Tác vụ Xác thực Antiforgery Token"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "Xác nhận"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "Xong"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "Hợp lệ"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "Tác vụ Xác thực Trường Biểu mẫu"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "Xác nhận"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "Xong"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "Hợp lệ"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "Tác vụ Xác thực Biểu mẫu"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "Xác nhận"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "Hợp lệ"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "Không hợp lệ"
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "Tên của trường biểu mẫu có giá trị không hợp lệ."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "Ràng buộc các trường biểu mẫu gửi đến trạng thái mô hình."
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "Chữ hiển thị trên nút."
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "Loại nút."
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "ID để kết xuất trên phần tử biểu mẫu này."
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "Tên để kết xuất trên phần tử mẫu này."
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "URL để gửi biểu mẫu đến."
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "Phương thức HTTP sưe dụng khi gửi biểu mẫu."
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "Loại nút."
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "Nội dung hiển thị khi trường không có giá trị."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "Giá trị mặc định cho trường này."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "Sửa Dữ liệu"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "Nội dung hiển thị khi ô nhập nội dung không có giá trị."
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "Xác thực <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "Tên của trường biểu mẫu để thực hiện xác thực."
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "Kiểm tra xem biểu mẫu đã gửi có chứa bất kỳ lỗi xác thực nào không."
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/vi/OrchardCore.GitHub.po b/Localization/vi/OrchardCore.GitHub.po
index 34f8f25b070f7..e7d91a2cc7382 100644
--- a/Localization/vi/OrchardCore.GitHub.po
+++ b/Localization/vi/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "Cài đặt Xác thực Github"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "Client ID được xác định trong tab chung trong <a target=\"_blank\" href=\"https://github.com/settings/apps\">Github App</a> của bạn."
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "Bí mật cho app của bạn."
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/vi/OrchardCore.Google.po b/Localization/vi/OrchardCore.Google.po
index 9a0d25e6e61bc..2b41f8b84288c 100644
--- a/Localization/vi/OrchardCore.Google.po
+++ b/Localization/vi/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "Cài đặt Google Analytics"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "Cài đặt Xác thực Google"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Client Id định nghĩa trong bảng điều khiển Google API cho ứng dụng."
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "Khoá bí mật cho client được xác định trong bảng điều khiển Google API cho ứng dụng."
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/vi/OrchardCore.Html.po b/Localization/vi/OrchardCore.Html.po
index ce33fe751ffdc..c64d6a119f5e0 100644
--- a/Localization/vi/OrchardCore.Html.po
+++ b/Localization/vi/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Trình soạn thảo Trực quan"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "Phần chính của mục nội dung."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "Tài liệu cho các tùy chọn"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "Nhập các tùy chọn trình soạn thảo"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "Tài liệu cho các tùy chọn"
diff --git a/Localization/vi/OrchardCore.Https.po b/Localization/vi/OrchardCore.Https.po
index c04388337c57b..79c6474ea6384 100644
--- a/Localization/vi/OrchardCore.Https.po
+++ b/Localization/vi/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "Xác định xem có nên sử dụng chuyển hướng vĩnh viễn, 308 Đã di chuyển Vĩnh viễn thay vì chuyển hướng tạm thời, 307 Tìm thấy khi chuyển hướng đến HTTPS"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/vi/OrchardCore.Infrastructure.Abstractions.po b/Localization/vi/OrchardCore.Infrastructure.Abstractions.po
index 82b6a7731c086..e1a55215dd289 100644
--- a/Localization/vi/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/vi/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2022-12-14 17:47\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "Chuyển đổi \"{0}\" không thấy"
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "Một thuộc tính \"{0}\" tồn tại nhưng không được trang trí bằng \"{1}\""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "Lỗi chuyển đổi giá trị \"{0}\" sang \"{1}\" cho chuyển đổi \"{2}\""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "Tham số lệnh \"{0}\" không khớp định nghĩa lệnh"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "Phương thức \"{0}\" không hỗ trợ chuyển đổi \"{1}\"."
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/vi/OrchardCore.Layers.po b/Localization/vi/OrchardCore.Layers.po
index 1e08084900077..67b955a25d12d 100644
--- a/Localization/vi/OrchardCore.Layers.po
+++ b/Localization/vi/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "Tạo Lớp"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "Mô tả"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "Chỉnh sửa Lớp – {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "Chỉnh sửa Tiện ích và Lớp"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "Đã di chuyển tiện ích.<a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Hoàn tác</strong></a>."
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "Khu vực"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "Xin vui lòng thêm <a href=\"{0}\">tạo ra một vùng có sẵn </a> trước khi thêm widget"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "Thêm Tiện ích"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "Lớp"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "Chọn một lớp để xem các tiện ích kết hợp với nó."
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "Sửa"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "Xóa"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "Xin vui lòng <a href=\"{0}\">tạo ra một lớp</a> trước khi thêm Tiện ích"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "Thêm"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "Nếu đánh dấu, tiêu đề sẽ được phát sinh cùng với tiện ích."
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "Lớp tiện ích sẽ kệt hợp cùng."
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/vi/OrchardCore.Liquid.po b/Localization/vi/OrchardCore.Liquid.po
index 2a5a43f9c3afb..12a7eee59bf56 100644
--- a/Localization/vi/OrchardCore.Liquid.po
+++ b/Localization/vi/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/vi/OrchardCore.Lists.po b/Localization/vi/OrchardCore.Lists.po
index af6e9c7efa8d8..fe1aaa09e1781 100644
--- a/Localization/vi/OrchardCore.Lists.po
+++ b/Localization/vi/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "Thể hiện một liên kết tới mục nội dung nguồn và thứ tự mà mục nội dung được thể hiện."
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "Thể hiện một tập các mục nội dung."
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "Bài viết Blog được chỉ định không tồn tại nữa. Vui lòng tạo một bài viết Blog mới."
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "Không được phép xóa nội dung này"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "Tên đăng nhập hoặc e-mail hoặc mật khẩu không chính xác."
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "Danh sách rỗng"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "Đánh dấu tuỳ chọn này để cho phép sắp thứ tự các mục thủ công."
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "Danh sách"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "Thêm mục menu cha"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/vi/OrchardCore.Localization.po b/Localization/vi/OrchardCore.Localization.po
index 3ad6f06485fc6..dfa781d696bd6 100644
--- a/Localization/vi/OrchardCore.Localization.po
+++ b/Localization/vi/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "Ngôn ngữ"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "Ngôn ngữ là bắt buộc"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "Trang web đã được khởi động lại để các cài đặt có hiệu lực."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "Những ngôn ngữ đã được cấu hình cho trang web."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "Thêm ngôn ngữ"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/vi/OrchardCore.Markdown.po b/Localization/vi/OrchardCore.Markdown.po
index a8bde1c735067..310107a456c77 100644
--- a/Localization/vi/OrchardCore.Markdown.po
+++ b/Localization/vi/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Trình soạn thảo Trực quan"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "Phần nội dung chính của mục nội dung, với định dạng Markdown."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Trình soạn thảo Trực quan"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/vi/OrchardCore.Media.po b/Localization/vi/OrchardCore.Media.po
index e0113818636fd..43481a7891f39 100644
--- a/Localization/vi/OrchardCore.Media.po
+++ b/Localization/vi/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "Không thể di chuyển bởi vì có một tệp cùng tên với nó đang tồn tại"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "Mặc định"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "Kích thước tùy chỉnh"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}: Có một lỗi xử lý các tập tệp."
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "Để có được các tài nguyên từ thư mục đầu hoặc từ tất cả các thư mục con."
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "Đảo ngược"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "Tạo Thư mục"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "Đổi tên mục"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "Tài nguyên"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,43 +1083,43 @@ msgid "Exports all or specified media."
 msgstr "Xuất tất cả hoặc một vài tài nguyên."
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "Đính kèm"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "Chon Tài nguyên"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "Đồng ý"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/vi/OrchardCore.Menu.po b/Localization/vi/OrchardCore.Menu.po
index 6c093bc2bba01..35072218a7976 100644
--- a/Localization/vi/OrchardCore.Menu.po
+++ b/Localization/vi/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "Menu"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "Mục menu đã xóa thành công."
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "Sửa {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "Xem tài liệu"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/vi/OrchardCore.Microsoft.Authentication.po b/Localization/vi/OrchardCore.Microsoft.Authentication.po
index 50dcec16e4713..991838efb14ab 100644
--- a/Localization/vi/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/vi/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Cài đặt Xác thực Tài khoản Microsoft"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "ID ứng dụng được tìm thấy trên các tham số cổng thông tin dành cho nhà phát triển của Microsoft."
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Khóa bí mật ứng dụng được tìm thấy trên các tham số cổng thông tin dành cho nhà phát triển của Microsoft."
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/vi/OrchardCore.Navigation.po b/Localization/vi/OrchardCore.Navigation.po
index 1c8bad074ba72..c8f896712dd2d 100644
--- a/Localization/vi/OrchardCore.Navigation.po
+++ b/Localization/vi/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/vi/OrchardCore.Notifications.po b/Localization/vi/OrchardCore.Notifications.po
index 7ca8a5c0a22b6..b77df70fcd357 100644
--- a/Localization/vi/OrchardCore.Notifications.po
+++ b/Localization/vi/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,10 +375,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/vi/OrchardCore.OpenId.po b/Localization/vi/OrchardCore.OpenId.po
index 4dd7674a81f20..3b6bc4eb2eddc 100644
--- a/Localization/vi/OrchardCore.OpenId.po
+++ b/Localization/vi/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "Tên này đã được lấy bởi một phạm vi khác."
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "Cấu hình máy chủ OpenID cập nhật thành công."
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "Cấu hình xác nhận OpenID được cập nhật thành công."
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "Tạo một ứng dụng mới"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "ID của client"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Thông tin nhận dạng ứng dụng PHẢI gửi câu hỏi bảo mật của họ khi liên lạc với token và thu hồi các endpoint. Điều này đảm bảo rằng client đã xác mình có thể trao đổi mã xác minh hoặc lấy một token mới."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "Cho phép Refresh Token Flow"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "Cho phép Logout Endpoint"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "Tạo một scope mới"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "Thêm một Ứng dụng"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "Client ID"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "Tên Hiển Thị"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "Thông tin nhận dạng ứng dụng PHẢI gửi câu hỏi bảo mật của họ khi liên lạc với token và thu hồi các endpoint. Điều này đảm bảo rằng client đã xác mình có thể trao đổi mã xác minh hoặc lấy một token mới."
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "Client secret"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "Cho phép Refresh Token Flow"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "Chỉnh sửa một scope"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Tenant hiện tại sẽ được tải lại sau khi các thiết lập được lưu."
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "Tên hiển thị của IdP"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "Authority sử dụng khi thực hiện gọi OpenIdConnect"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "'client_id'"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "Path được yêu cầu bên trong đường dẫn cơ bản của ứng dụng nơi user-agent sẽ được trả lại. Chương trình trung gian sẽ xử lí yêu cầu này ngay khi nó đến."
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "Xem post_logout_redirect_uri từ "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "Uri nơi mà các người dùng sẽ được chuyển hướng đến sau khi ứng dụng được đăng xuất từ nhà cung cấp được nhận dạng. Chuyển hướng sẽ xảy ra sau khi SignedOutCallbackPath được kích hoạt."
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "Hãy xem: "
@@ -1217,15 +1217,15 @@ msgstr "Sử dụng 'code' loại trả về"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "ví dụ:"
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "Sử dụng 'code token' cho kiểu trả về"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "Flow xác minh ngầm"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "Sử dụng 'id_token' cho kiểu trả về"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "Sử dụng 'id_token token' cho kiểu trả về"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "Chế độ response"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "Cấu hình chế độ response xem tại: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "Client secret"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "Thiết lập client secret."
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "Đồng ý"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "Các tùy chọn này đều là tùy chọn và chỉ dành cho người dùng nâng cao."
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "URL nhận diện cơ bản của server (website này). Nếu không được cấp, một giá trị mặc định trên dựa trên máy chủ sẽ được tự động đưa ra."
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "Bạn cần phải thêm một certificate cho server để thiết lập OpenID Connect module."
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Tenant hiện tại sẽ được tải lại sau khi các thiết lập được lưu."
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "Máy chủ Xác thực tenant"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "Địa chỉ của một máy chủ OpenID Connect. Bạn được khuyên nên sử dụng địa chỉ HTTPS."
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/vi/OrchardCore.Placements.po b/Localization/vi/OrchardCore.Placements.po
index 92a046d017a91..0436160a007b8 100644
--- a/Localization/vi/OrchardCore.Placements.po
+++ b/Localization/vi/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/vi/OrchardCore.ProjectTemplates.po b/Localization/vi/OrchardCore.ProjectTemplates.po
index b0004017e883a..e5703cd3d15b4 100644
--- a/Localization/vi/OrchardCore.ProjectTemplates.po
+++ b/Localization/vi/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "Hiện"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/vi/OrchardCore.PublishLater.po b/Localization/vi/OrchardCore.PublishLater.po
index fb7475477733e..670f5af5fd2e6 100644
--- a/Localization/vi/OrchardCore.PublishLater.po
+++ b/Localization/vi/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "Xuất bản sau"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/vi/OrchardCore.Queries.po b/Localization/vi/OrchardCore.Queries.po
index 9a855025beb39..1485df6584a1c 100644
--- a/Localization/vi/OrchardCore.Queries.po
+++ b/Localization/vi/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "Thực hiện truy vấn SQL"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "Gặp lỗi trong khi thực hiện truy vấn SQL: {0}"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "Truy vấn SQL"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "Truy vấn SQL sử dụng cú pháp SQL92 tiêu chuẩn và được chuyển đổi dựa trên cơ sở dữ liệu thực tế. Các bảng sẽ được đặt tiền tố tự động."
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "Truy vấn"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "Tên kỹ thuật của truy vấn."
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "Khi được đánh dấu, kết quả trả về là một danh sách các Id của tài liệu."
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/vi/OrchardCore.ReCaptcha.Core.po b/Localization/vi/OrchardCore.ReCaptcha.Core.po
index 2eb29edfdc134..44455fd65f471 100644
--- a/Localization/vi/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/vi/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2021-07-15 18:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "Không thể xác thực captcha"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "Không thể xác thực captcha"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "Không thấy ngôn ngữ {0}"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/vi/OrchardCore.ReCaptcha.po b/Localization/vi/OrchardCore.ReCaptcha.po
index 5ed8eb00e54ab..0b4ef1fd68ad3 100644
--- a/Localization/vi/OrchardCore.ReCaptcha.po
+++ b/Localization/vi/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "Xuất cài đặt ReCaptcha."
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "Tác vụ Xác thực ReCaptcha"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "Xác nhận"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "Xong"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "Hợp lệ"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "Xác minh captcha thất bại. Vui lòng thử lại."
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Trang web hiện tại sẽ được tải lại sau khi các cài đặt được lưu."
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "Khóa trang web reCaptcha của bạn."
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/vi/OrchardCore.Recipes.Core.po b/Localization/vi/OrchardCore.Recipes.Core.po
index 9d56ba9a97398..67cbf6ff14263 100644
--- a/Localization/vi/OrchardCore.Recipes.Core.po
+++ b/Localization/vi/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2022-12-14 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/vi/OrchardCore.Roles.po b/Localization/vi/OrchardCore.Roles.po
index 982ac29fbb5d3..d45962f19f3f5 100644
--- a/Localization/vi/OrchardCore.Roles.po
+++ b/Localization/vi/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "Vai trò"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "Tên vai trò không hợp lệ."
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "Vai trò đã được cập nhật thành công."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "Không thể xoá vai trò hệ thống."
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "Tạo Vai trò"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "Tên vai trò"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "Chỉnh sửa Chi tiết Vai trò"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "Quyền"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "Quyền này có thể cho phép người dùng nâng cao các quyền khác của họ. Cấp nó với sự cân nhắc kỹ lưỡng."
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "Vai trò"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/vi/OrchardCore.Rules.po b/Localization/vi/OrchardCore.Rules.po
index 5d6d66f98c498..5039a605e0d8b 100644
--- a/Localization/vi/OrchardCore.Rules.po
+++ b/Localization/vi/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "Tất cả"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "Bất kỳ"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "Thêm"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "Loại nội dung"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "Ngôn ngữ"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/vi/OrchardCore.Search.Elasticsearch.po b/Localization/vi/OrchardCore.Search.Elasticsearch.po
index 815b95b3c3f86..9ef33eed0c540 100644
--- a/Localization/vi/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/vi/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,127 +56,127 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr "Elasticsearch"
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr "Đặt lại"
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr "Xây dựng lại"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr "Xoá"
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr "Chỉ mục có tên {0} đã tồn tại."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "Chỉ mục có tên {0} không tồn tại."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "Có lỗi đã xảy ra khi tạo chỉ mục."
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "Chỉ mục <em>{0}</em> đã được tạo."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "Chỉ mục <em>{0}</em> đã đặt lại."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "Chỉ mục <em>{0}</em> đã lập chỉ mục lại."
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "Chỉ mục <em>{0}</em> đã xoá thành công."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "Có lỗi đã xảy ra khi xoá chỉ mục."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Truy vấn không hợp lệ : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr "Tên chỉ mục là bắt buộc."
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
-msgstr "Tên chỉ mục có các ký tự không cho phép."
+msgid "The index name contains forbidden characters."
+msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
 #: OrchardCore.Search.Elasticsearch\Drivers\ElasticQueryDisplayDriver.cs:65
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr "Trường chỉ mục là bắt buộc"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr "Xem tài liệu"
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr "Chạy"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,53 +572,53 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
-msgstr "Xem tài liệu"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
+msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticSettingsDeploymentStep.Fields.Edit.cshtml:3
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/vi/OrchardCore.Search.Lucene.po b/Localization/vi/OrchardCore.Search.Lucene.po
index 4c56c621b9128..f3a931e715229 100644
--- a/Localization/vi/OrchardCore.Search.Lucene.po
+++ b/Localization/vi/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr "Lucene"
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr "Thiết lập lại"
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr "Xây dựng lại"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr "Xóa"
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr "Chỉ mục có tên {0} đã tồn tại."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr "Chỉ mục có tên {0} không tồn tại."
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr "Có lỗi đã xảy ra khi tạo chỉ mục."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr "Chỉ mục <em>{0}</em> đã được tạo."
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr "Chỉ mục <em>{0}</em> đã đặt lại."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr "Chỉ mục <em>{0}</em> đã lập chỉ mục lại."
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr "Chỉ mục <em>{0}</em> đã xoá thành công."
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr "Có lỗi đã xảy ra khi xoá chỉ mục."
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr "Truy vấn không hợp lệ : {0}"
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr "Tên chỉ mục là bắt buộc."
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr "Tên chỉ mục có các ký tự không cho phép."
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr "Lucene"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "Tất cả"
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr "Chạy"
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr "Truy vấn Lucene"
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr "Tạo"
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/vi/OrchardCore.Search.po b/Localization/vi/OrchardCore.Search.po
index 3a2b27e77f7d7..5badbda7d3d38 100644
--- a/Localization/vi/OrchardCore.Search.po
+++ b/Localization/vi/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/vi/OrchardCore.Security.po b/Localization/vi/OrchardCore.Security.po
index 50f35482d1151..cb1750bf116b0 100644
--- a/Localization/vi/OrchardCore.Security.po
+++ b/Localization/vi/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/vi/OrchardCore.Seo.po b/Localization/vi/OrchardCore.Seo.po
index 1b4b331f7d5cd..2a46a56fd4c3f 100644
--- a/Localization/vi/OrchardCore.Seo.po
+++ b/Localization/vi/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "Sửa Dữ liệu"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/vi/OrchardCore.Settings.po b/Localization/vi/OrchardCore.Settings.po
index c683e8a96f4ed..543456ad2414b 100644
--- a/Localization/vi/OrchardCore.Settings.po
+++ b/Localization/vi/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "Cài đặt trang web được cập nhật thành công."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "Url cơ sở phải là một URL đủ điều kiện."
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "Cài đặt Website"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/vi/OrchardCore.Setup.Core.po b/Localization/vi/OrchardCore.Setup.Core.po
index 0796f1e426b64..8f8829dd3fd18 100644
--- a/Localization/vi/OrchardCore.Setup.Core.po
+++ b/Localization/vi/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr "Cài đặt DatabaseProvider là bắt buộc."
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/vi/OrchardCore.Setup.po b/Localization/vi/OrchardCore.Setup.po
index 86b1fe3fd0e25..5599425bd37b0 100644
--- a/Localization/vi/OrchardCore.Setup.po
+++ b/Localization/vi/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "Mật khẩu phải có ít nhất {0} kí tự."
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "Không thể thiết lập một trang web mà không có công thức."
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "Phần này được dùng để làm tiêu đề mặc định cho các trang của bạn."
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "Công thức cho phép bạn thiết lập trang web của mình với các tùy chọn, tính năng và cài đặt được cấu hình sẵn."
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "Xác định múi giờ mặc định được dùng khi hiển thị và chỉnh sửa ngày tháng và thời gian."
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "Cơ sở dữ liệu được sử dụng để lưu trữ cấu hình và nội dung của trang web."
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "Bạn có thể chỉ định tiền tố cho bảng nếu bạn sử dụng cùng một cơ sở dữ liệu cho nhiều trang web."
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "Hiện/ẩn chuỗi kết nối"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "Super User có tất cả các quyền. Nó chỉ được sử dụng trong quá trình Thiết lập và khắc phục thảm họa."
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "Tên đăng nhập"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "Email không hợp lệ."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "Độ mạnh của mật khẩu"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/vi/OrchardCore.Shortcodes.po b/Localization/vi/OrchardCore.Shortcodes.po
index c0bb9b5f14889..8849035ec2bcd 100644
--- a/Localization/vi/OrchardCore.Shortcodes.po
+++ b/Localization/vi/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/vi/OrchardCore.Sitemaps.po b/Localization/vi/OrchardCore.Sitemaps.po
index 794545454fa41..807215d3cb538 100644
--- a/Localization/vi/OrchardCore.Sitemaps.po
+++ b/Localization/vi/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "Tên"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/vi/OrchardCore.Sms.Core.po b/Localization/vi/OrchardCore.Sms.Core.po
index d52428cd4e80c..c8e35e6f0e0eb 100644
--- a/Localization/vi/OrchardCore.Sms.Core.po
+++ b/Localization/vi/OrchardCore.Sms.Core.po
@@ -10,19 +10,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-24 15:55\n"
+"PO-Revision-Date: 2023-11-07 10:13\n"
 
 #. public LocalizedString Name => S["Default"];
 #: OrchardCore.Sms.Core\Services\DefaultSmsProvider.cs:15
 msgctxt "OrchardCore.Sms.Services.DefaultSmsProvider"
 msgid "Default"
-msgstr ""
+msgstr "Mặc định"
 
 #. return Task.FromResult(SmsResult.Failed(S["SMS settings must be configured before an SMS message can be sent."]));
 #: OrchardCore.Sms.Core\Services\DefaultSmsProvider.cs:19
 msgctxt "OrchardCore.Sms.Services.DefaultSmsProvider"
 msgid "SMS settings must be configured before an SMS message can be sent."
-msgstr ""
+msgstr "Cài đặt SMS phải được cấu hình trước khi SMS có thể gửi được."
 
 #. public LocalizedString Name => S["Log - writes messages to the logs"];
 #: OrchardCore.Sms.Core\Services\LogSmsProvider.cs:14
@@ -40,7 +40,7 @@ msgstr ""
 #: OrchardCore.Sms.Core\Services\TwilioSmsProvider.cs:29
 msgctxt "OrchardCore.Sms.Services.TwilioSmsProvider"
 msgid "Twilio"
-msgstr ""
+msgstr "Twilio"
 
 #. return SmsResult.Failed(S["SMS message was not send."]);
 #: OrchardCore.Sms.Core\Services\TwilioSmsProvider.cs:94
diff --git a/Localization/vi/OrchardCore.Sms.po b/Localization/vi/OrchardCore.Sms.po
index 1f28f68f3f567..ec5a976a85b93 100644
--- a/Localization/vi/OrchardCore.Sms.po
+++ b/Localization/vi/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
 #: OrchardCore.Sms\Activities\SmsTask.cs:34
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "Messaging"
-msgstr ""
+msgstr "Nhắn tin"
 
 #. return Outcomes(S["Done"], S["Failed"]);
 #: OrchardCore.Sms\Activities\SmsTask.cs:50
@@ -40,13 +40,13 @@ msgstr ""
 #: OrchardCore.Sms\AdminMenu.cs:25
 msgctxt "OrchardCore.Sms.AdminMenu"
 msgid "Configuration"
-msgstr ""
+msgstr "Cấu hình"
 
 #. .Add(S["Settings"], settings => settings
 #: OrchardCore.Sms\AdminMenu.cs:26
 msgctxt "OrchardCore.Sms.AdminMenu"
 msgid "Settings"
-msgstr ""
+msgstr "Cài đặt"
 
 #. .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms
 #. .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms
@@ -54,7 +54,7 @@ msgstr ""
 #: OrchardCore.Sms\AdminMenu.cs:27
 msgctxt "OrchardCore.Sms.AdminMenu"
 msgid "SMS"
-msgstr ""
+msgstr "SMS"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.PhoneNumber), S["Phone number requires a value."]);
 #: OrchardCore.Sms\Drivers\SmsTaskDisplayDriver.cs:46
@@ -84,7 +84,7 @@ msgstr ""
 #: OrchardCore.Sms\Drivers\TwilioSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Sms.Drivers.TwilioSettingsDisplayDriver"
 msgid "Please provide a valid phone number."
-msgstr ""
+msgstr "Vui lòng cung cấp số điện thoại hợp lệ."
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.AccountSID), S["Account SID requires a value."]);
 #: OrchardCore.Sms\Drivers\TwilioSettingsDisplayDriver.cs:84
@@ -102,9 +102,9 @@ msgstr ""
 #: OrchardCore.Sms\Views\NavigationItemText-sms.Id.cshtml:4
 msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
-msgstr ""
+msgstr "SMS"
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,11 +134,11 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
-msgstr ""
+msgstr "Nội dung"
 
 #. <span class="hint">@T["The body of the SMS message. With Liquid support."]</span>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:15
@@ -150,7 +150,7 @@ msgstr ""
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Thumbnail.cshtml:2
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Thumbnail"
 msgid "Send SMS"
-msgstr ""
+msgstr "Gửi SMS"
 
 #. <p>@T["Send an SMS message."]</p>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Thumbnail.cshtml:4
@@ -164,11 +164,11 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
-msgstr ""
+msgstr "Số điện thoại"
 
 #. <span class="hint">@T["Phone number must include a country code. For example, +1 for United States."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:13
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
-msgstr ""
+msgstr "Tài khoản SID"
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
-msgstr ""
+msgstr "Token xác thực"
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/vi/OrchardCore.Spatial.po b/Localization/vi/OrchardCore.Spatial.po
index 16f8446e746cb..2560e41e90145 100644
--- a/Localization/vi/OrchardCore.Spatial.po
+++ b/Localization/vi/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr "Vĩ độ"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr "Vĩ độ"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "Có thể bắt buộc một giá trị."
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/vi/OrchardCore.Taxonomies.po b/Localization/vi/OrchardCore.Taxonomies.po
index 36c06faec62ff..b5a76a9060ad6 100644
--- a/Localization/vi/OrchardCore.Taxonomies.po
+++ b/Localization/vi/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "Một giá trị là bắt buộc cho '{0}'"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "Nhập để tìm kiếm"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "Chọn"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "Loại bỏ"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "Phân loại không thể được tìm thấy. Vui lòng kiểm tra các cài đặt cho lĩnh vực này."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "Gợi ý để hiển thị cho trường này trên trình soạn thảo."
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "Phân loại"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "Yêu cầu"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "Đảm bảo ít nhất một yếu tố được chọn."
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "Duy nhất"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "Chỉ Mục con"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "Chỉ các mục con có thể được chọn."
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "Loại Nội dung Điều kiện"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "Thêm {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "Bạn đã sắp xếp lại phân loại."
diff --git a/Localization/vi/OrchardCore.Templates.Cms.Module.po b/Localization/vi/OrchardCore.Templates.Cms.Module.po
index 7db289b5a315f..7c81f76c53fdd 100644
--- a/Localization/vi/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/vi/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "Hiện"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/vi/OrchardCore.Templates.po b/Localization/vi/OrchardCore.Templates.po
index 56d269296d46b..e661267a9ed64 100644
--- a/Localization/vi/OrchardCore.Templates.po
+++ b/Localization/vi/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "Mẫu \"{0}\" đã được tạo."
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "Xóa khuân mẫu thành công."
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "Đã xóa các mẫu thành công."
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "Xem trước"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "Tên của mẫu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "Mô tả của mẫu."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "Xem trước"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "Tên của mẫu."
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "Mô tả của mẫu."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/vi/OrchardCore.Tenants.po b/Localization/vi/OrchardCore.Tenants.po
index 0248902acc281..9f19eb4761709 100644
--- a/Localization/vi/OrchardCore.Tenants.po
+++ b/Localization/vi/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "Thuê dịch vụ"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "Tất cả"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "Tất cả trạng thái"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "Ðang chạy"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "Vô hiệu hóa"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "Chưa hoàn thành"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "Tên"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "Trạng thái"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "Vô hiệu hóa"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "Kích hoạt"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "Bạn không thể vô hiệu hóa bản thuê dịch vụ mặc định."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "Khách hàng '{0}' đã bị vô hiệu hoá."
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "Khách hàng '{0}' đã được kích hoạt."
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "Bạn chỉ có thể kích hoạt một khách hàng đã vô hiệu hoá."
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "Email không hợp lệ."
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "Không thấy khách hàng: '{0}'"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "Khách hàng không thể thiết lập."
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "Chưa chỉ định cơ sở dữ liệu."
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "Cần cung cấp chuỗi kết nối tới cơ sở dữ liệu này."
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "Yêu cầu 'Recipe' hoặc 'RecipeName'."
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "Công thức '{0}' không tìm thấy."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "Tạo Khách hàng"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "Tạo Khách hàng"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "Chọn tên khách hàng để tạo."
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "Ví dụ: Nếu host là \"orchardproject.net\", URL của khách hàng là \"http://orchardproject.net/\". Có hỗ trợ Liquid."
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Sử dụng loại cơ sở dữ liệu nào?"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tiền tố của Bảng"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Chuỗi kết nối"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "Vô hiệu hoá Khách hàng"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "Sửa Khách hàng"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "Kích hoạt Khách hàng"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "Kích hoạt một khách hàng."
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "Thiết kế"
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "Cài đặt Khách hàng"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "Chọn tên khách hàng để cài đặt."
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "Tên website"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "Tên đăng nhập quản trị"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "Email quản trị"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "Mật khẩu quản trị"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "Sử dụng loại cơ sở dữ liệu nào?"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "Tiền tố của Bảng"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "Chuỗi kết nối"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/vi/OrchardCore.Tests.po b/Localization/vi/OrchardCore.Tests.po
index 555c8e40e1dc4..f5d7aca40e0b2 100644
--- a/Localization/vi/OrchardCore.Tests.po
+++ b/Localization/vi/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/vi/OrchardCore.Themes.po b/Localization/vi/OrchardCore.Themes.po
index 6197997da9110..fe4f34babf6bd 100644
--- a/Localization/vi/OrchardCore.Themes.po
+++ b/Localization/vi/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "Xuất chủ đề website đã chọn và chủ đề trang admin."
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/vi/OrchardCore.Title.po b/Localization/vi/OrchardCore.Title.po
index c8db612487159..8f0b0879f57c6 100644
--- a/Localization/vi/OrchardCore.Title.po
+++ b/Localization/vi/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "Tiêu đề bắt buộc phải có."
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Mẫu không chứa biểu thức Liquid hợp lệ. Chi tiết: {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "Tiêu đề sẽ được tạo tự động bằng cách sử dụng mẫu."
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "Kiểm tra để hiển thị tiêu đề trong chế độ xem hiển thị."
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/vi/OrchardCore.Twitter.po b/Localization/vi/OrchardCore.Twitter.po
index 0a66f824b09af..9ed9a900fc016 100644
--- a/Localization/vi/OrchardCore.Twitter.po
+++ b/Localization/vi/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "Access token secret là bắt buộc"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "Tác vụ Cập nhật Trạng thái Twitter"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "Xã hội"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "Hoàn thành"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "Thất bại"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "Trang web hiện tại sẽ được tải lại sau khi các cài đặt được lưu."
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "Xem tài liệu"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "Đã xảy ra lỗi khi giải mã cài đặt. Hãy áp dụng và lưu lại."
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Cài đặt Tích hợp Twitter"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "Khoá API"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Khóa API được xác định trong tab Keys and tokens của bảng điều khiển ứng dụng twitter."
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "Khoá bí mật API"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Bí mật API được xác định trong tab Keys and tokens của bảng điều khiển ứng dụng twitter."
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "Access Token được xác định trong tab Keys and tokens của bảng điều khiển ứng dụng twitter."
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "Access Token Secret được xác định trong tab Keys and tokens của bảng điều khiển ứng dụng twitter."
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "Đăng nhập bằng Cài đặt Twitter"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "Cập nhật Trạng thái Twitter"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/vi/OrchardCore.Users.Core.po b/Localization/vi/OrchardCore.Users.Core.po
index b6ed5b13fe9d4..e5938a5e2d7a8 100644
--- a/Localization/vi/OrchardCore.Users.Core.po
+++ b/Localization/vi/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "Email '{0}' không hợp lệ."
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "Lỗi bất ngờ: '{0} '."
diff --git a/Localization/vi/OrchardCore.Users.po b/Localization/vi/OrchardCore.Users.po
index 43dbef7bbebde..0dc2870a88364 100644
--- a/Localization/vi/OrchardCore.Users.po
+++ b/Localization/vi/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "Đã tạo người dùng thành công"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "Đã vô hiệu hóa đăng nhập cục bộ."
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "Tài khoản này đã bị khóa"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "Cố gắng đăng nhập không hợp lệ."
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "Mật khẩu của bạn đã được thay đổi thành công."
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "Đã xảy ra lỗi do nhà cung cấp bên ngoài."
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "Trang web không cho phép đăng ký người dùng."
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "Xác thực tài khoản của bạn"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "Người dùng chỉ định không được phép đăng nhập."
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "Bạn cần xác nhận email của mình."
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "Tất cả người dùng"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "Người dùng đã kích hoạt"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "Người dùng bị vô hiệu hóa"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "Tên"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "Email"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "Chấp nhận"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "Kích hoạt"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "Vô hiệu hóa"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "Xóa"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "Tất cả vai trò"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "Người dùng {0} đã được chấp nhận."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "Người dùng {0} đã được xoá."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "Người dùng {0} đã được vô hiệu hoá."
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "Người dùng {0} đã được kích hoạt."
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "Đã tạo người dùng thành công."
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "Đã cập nhật người dùng thành công."
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "Người sử dụng xóa thành công."
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "Không thể xoá người dùng."
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "Mật khẩu được cập nhật chính xác."
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "Người dùng đã mở khóa thành công."
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "Không thể mở khóa người dùng."
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "Cài đặt Đăng nhập"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "Xuất cài đặt Đăng nhập."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "Thay đổi cài đặt Email"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "Xuất cài đặt Thay đổi email."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "Cài đặt đăng ký"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "Xuất cài đặt Đăng ký."
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "Đặt lại cài đặt Mật khẩu"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "Xuất cài đặt Đặt lại mật khẩu."
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "Mật khẩu mới và mật khẩu xác nhận không giống nhau."
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "Gán Nhiệm vụ Vai trò Người dùng"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "Người dùng"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "Xong"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "Thất bại"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "Đăng ký Nhiệm vụ Người dùng"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "Người dùng"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "Xong"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "Hợp lệ"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "Không có dịch vụ email"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "Người dùng"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "Ẩn danh"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "Đã xác thực"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "Một giá trị là bắt buộc cho {0}."
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} với vai trò {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "Người dùng được phân công. Với sự hỗ trợ của Liquid."
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "Mật khẩu hiện tại"
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "Tạo người dùng"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "Chỉnh sửa mật khẩu"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "Vui lòng kiểm tra email của bạn để đặt lại mật khẩu."
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "Thay đổi Email"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "Bạn đã xác thực thành công với <strong>{0}</strong>. Bạn đã có một tài khoản với địa chỉ email này. Nhập mật khẩu tài khoản cục bộ của bạn và nhấp vào nút Đăng ký để liên kết các tài khoản và hoàn tất đăng nhập."
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "Sử dụng dịch vụ khác để đăng nhập"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "Tạo tài khoản mới."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "Mật khẩu"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "Bạn đã xác thực thành công với <strong>{0}</strong>. Vui lòng điền vào mẫu dưới đây và nhấp vào nút Đăng ký để hoàn tất đăng ký."
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "Mật khẩu"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "Gửi email xác nhận"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "Đặt lại mật khẩu"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "Người dùng bị vô hiệu hóa."
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "Người dùng đã được kích hoạt."
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "Bỏ chọn để vô hiệu hóa tài khoản người dùng này."
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3416,7 +3488,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3440,16 +3512,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr ""
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/vi/OrchardCore.Widgets.po b/Localization/vi/OrchardCore.Widgets.po
index f7f58771cf0c4..e1cdc1e5bf455 100644
--- a/Localization/vi/OrchardCore.Widgets.po
+++ b/Localization/vi/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "Thêm Tiện ích"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "Tiêu chuẩn"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/vi/OrchardCore.Workflows.po b/Localization/vi/OrchardCore.Workflows.po
index 7fabc754c5596..620df46db7478 100644
--- a/Localization/vi/OrchardCore.Workflows.po
+++ b/Localization/vi/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "Tác vụ Cam kết Giao dịch"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "Phiên làm việc"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "Hoàn thành"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "Hợp lệ"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "Tác vụ Tương quan"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "Nguyên thủy"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "Tác vụ For Each"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "Lặp lại"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "Tác vụ Fork"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "Tác vụ Vòng lặp For"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "Lặp lại"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "Tác vụ If Else"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "Đúng"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "Sai"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "Tác vụ Join"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "Đã nối"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "Tác vụ Log"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "Nguyên thủy"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "Xong"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "Ngoại lệ"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "Tác vụ Cảnh báo"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "Giao diện người dùng"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "Tác vụ Script"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "Tác vụ Đặt Đầu ra"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "Nguyên thủy"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "Tác vụ Đặt Thuộc tính"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "Nguyên thủy"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "Tác vụ Vòng lặp While"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "Luồng Điều khiển"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "Lặp lại"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "Xong"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "Hoạt động đã được cập nhật."
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "Đã được tạo gần đây"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "Cập Nhật gần đây nhất"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "Lỗi"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "Đã hoàn thành"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "Xóa"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "Quy trình {0} đã bị xóa."
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "Xóa"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "Quy trình {0} đã bị xóa."
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "Quy trình đã được lưu."
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "Đã xóa quy trình làm việc {0}"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Tác vụ Http Redirect"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "Xong"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Sự kiện Http Request"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "Xong"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "Giống nhau"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Tác vụ Http Request"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "Trạng thái Http Chưa được xử lý"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Tác vụ Http Response"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "Xong"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "Chưa được xác thực để kích hoạt '{0}'."
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "Tác vụ đầu tiên"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "Sửa"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "Thêm"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "Liên quan"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "Quay lại"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "Xóa"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "Sự kiện Đã có"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "Các tác vụ Đã có"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "Bạn có chắc chắn muốn xóa hoạt động này không?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "Bộ lọc"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "Lặp lại <em>{0}</em> qua <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "Danh sách để lặp lại. Với sự hỗ trợ JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "Không có nhánh"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "Lặp lại <em>{0}</em> <em>{1}</em> <em>{2}</em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "Giá trị bắt đầu. Có hỗ trợ JavaScript."
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "Giá trị kết thúc. Có hỗ trợ JavaScript."
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "Giá trị vòng lặp Step. Có hỗ trợ JavaScript."
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1234,7 +1286,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "Chuyển hướng HTTP"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1247,13 +1299,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "URL để chuyển hướng đến. Hỗ trợ cú pháp Liquid."
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "Cố định"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "Đánh dấu nếu chuyển hướng vĩnh viễn (301). Không đánh dấu để chuyển hướng tạm thời (302)."
@@ -1276,7 +1328,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "Xử lý các yêu cầu HTTP đến"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1312,36 +1364,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "Bất cứ ai bấm vào URL này sẽ kích hoạt quy trình công việc này. Giữ nó ở một nơi an toàn."
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "Xác thực Antiforgery Token"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "Bỏ đánh dấu tùy chọn này nếu yêu cầu đến từ một dịch vụ gọi URL này dưới dạng webhook. Nếu URL này được yêu cầu từ một biểu mẫu, thì hãy giữ tùy chọn này để đảm bảo các giá trị của biểu mẫu không bị giả mạo."
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr ""
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "Nhấn nút <b>Tạo lại</b> sau khi thay đổi giá trị này."
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "Số ngày hết hạn token. 0 cho token không bao giờ hết hạn"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1360,7 +1424,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "Lọc các yêu cầu HTTP đến"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1372,7 +1436,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "Phương thức HTTP để khớp với."
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1384,7 +1448,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "Tên controller để khớp với."
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1396,7 +1460,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "Tên hành động để khớp với."
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1432,7 +1496,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1444,7 +1508,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "URL để gửi yêu cầu tới. Hỗ trợ cú pháp Liquid."
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1456,7 +1520,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "Phương thức HTTP. Ví dụ: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1468,7 +1532,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "Loại nội dung của nội dung yêu cầu."
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1480,7 +1544,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "Nội dung để gửi với các yêu cầu POST, PUT và PATCH. Hỗ trợ Liquid."
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1492,7 +1556,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "Cung cấp các tiêu đề HTTP bổ sung, mỗi tiêu đề một dòng. Ví dụ: Authorization: Bearer 123ABC. Với sự hỗ trợ của Liquid."
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1522,7 +1586,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "Phản hồi HTTP"
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1534,7 +1598,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "Mã Trạng thái HTTP để gửi lại. Bấm <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">vào đây</a> để xem danh sách đầy đủ."
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1546,7 +1610,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "Loại nội dung của nội dung phản hồi."
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1558,7 +1622,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "Nội dung gửi lại. Với sự hỗ trợ của Liquid."
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1594,7 +1658,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "Đánh giá <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1704,40 +1768,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "Sắp xếp"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "Xóa"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "Đã tạo {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>Không có gì ở đây!</strong> Không có quy trình nào đang dừng ở thời điểm này."
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "Quay lại"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "đã chọn"
@@ -1834,12 +1912,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "Vô hiệu hóa"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "{0} trường hợp"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1873,7 +1950,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "Đang chờ <strong>một vài</strong> hoạt động đến trước khi tham gia thực thi vào một nhánh duy nhất."
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1903,7 +1980,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "Nhật ký"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1915,7 +1992,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "Mức nhật ký."
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1963,7 +2040,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0} Thông báo"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1975,7 +2052,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "Loại thông báo."
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2005,7 +2082,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr ""
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2017,7 +2094,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "Danh sách các kết quả có sẵn được ngăn cách bởi dấu phẩy."
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2047,7 +2124,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "Đầu ra thông qua {0}"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2059,7 +2136,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "Tên để đầu ra tới."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2089,7 +2166,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "Thiết lập {0} thuộc tính"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2101,7 +2178,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "Thuộc tính để thiết lập. Nếu thuộc tính chỉ định chưa tồn tại, nó sẽ được thêm vào."
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2137,7 +2214,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "Khi <em>{0}</em> được kích hoạt"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2173,7 +2250,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2227,7 +2304,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "Không có hành động cho người dùng được chỉ định"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2239,7 +2316,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "Nhập một hoặc nhiều tên hành động được phân tách bằng dấu phẩy."
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2275,7 +2352,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "Lặp lại trong khi <em>{0}</em> là đúng"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2299,3 +2376,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "Lặp đi lặp lại trong khi một điều kiện là đúng."
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/vi/TheAdmin.po b/Localization/vi/TheAdmin.po
index 01d783ca1491b..9ed952ba681cc 100644
--- a/Localization/vi/TheAdmin.po
+++ b/Localization/vi/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "Chế độ sáng"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "Chế độ tối"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "Thăm Website"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "Thu gọn / mở rộng menu"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "Xóa"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "Bạn có muốn xóa bỏ thành phần này không?"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "Đồng ý"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "Bỏ qua"
@@ -75,26 +53,52 @@ msgstr "Bộ lọc"
 #: TheAdmin\Views\Pager_First.cshtml:0
 msgctxt "TheAdmin.Views.Pager_First"
 msgid "Go to first page."
-msgstr ""
+msgstr "Đến trang đầu tiên."
 
 #: TheAdmin\Views\Pager_Last.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Last"
 msgid "Go to last page."
-msgstr ""
+msgstr "Đến trang cuối."
 
 #: TheAdmin\Views\Pager_Next.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Next"
 msgid "Go to next page."
-msgstr ""
+msgstr "Đến trang tiếp theo."
 
 #: TheAdmin\Views\Pager_Previous.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Previous"
 msgid "Go to previous page."
-msgstr ""
+msgstr "Trở về trang trước."
 
 #. <nav aria-label="@T["Listing pages"]">
 #: TheAdmin\Views\Pager.cshtml:6
 msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
+msgstr "Danh sách các trang"
+
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
 msgstr ""
 
diff --git a/Localization/vi/TheAgencyTheme.po b/Localization/vi/TheAgencyTheme.po
index 19b84aa25f1bd..53a37cb117f0d 100644
--- a/Localization/vi/TheAgencyTheme.po
+++ b/Localization/vi/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "Không có kết quả nào."
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Không tìm thấy trang này"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "Không tìm thấy trang bạn yêu cầu."
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/vi/TheBlogTheme.po b/Localization/vi/TheBlogTheme.po
index be2b95feb8251..07a8521625cf9 100644
--- a/Localization/vi/TheBlogTheme.po
+++ b/Localization/vi/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-02-18 20:36\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "ngày {0}"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "Không có kết quả nào."
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "Không Tìm Thấy Trang"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/vi/TheTheme.po b/Localization/vi/TheTheme.po
index 70006d60804f4..9f97f708b40f7 100644
--- a/Localization/vi/TheTheme.po
+++ b/Localization/vi/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:31\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "Chào mừng bạn đến với Orchard Core, trang web của bạn đã được thiết lập thành công."
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/zh-Hans/OrchardCore.Admin.po b/Localization/zh-Hans/OrchardCore.Admin.po
index f0247c29e02ab..2c2d640349596 100644
--- a/Localization/zh-Hans/OrchardCore.Admin.po
+++ b/Localization/zh-Hans/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:41\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "管理员"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "管理员设置"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "导出管理员设置。"
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "欢迎使用 Orchard Core"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "浏览左侧菜单体验可用功能。"
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "启用暗色模式管理主题"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "是否可以显示暗色模式管理主题"
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "标题是否显示在顶部栏中。"
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "管理员"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/zh-Hans/OrchardCore.AdminDashboard.po b/Localization/zh-Hans/OrchardCore.AdminDashboard.po
index d412dc82abd18..78031a245ad4d 100644
--- a/Localization/zh-Hans/OrchardCore.AdminDashboard.po
+++ b/Localization/zh-Hans/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:42\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "否"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "位置"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "宽度"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
@@ -174,7 +174,7 @@ msgstr "仪表盘"
 #: OrchardCore.AdminDashboard\Views\Dashboard\Index.cshtml:50
 msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.Index"
 msgid "Click on Manage Dashboard button to add dashboard widget."
-msgstr ""
+msgstr "点击管理面板按钮添加面板部件。"
 
 #. @T["Close Editor"]
 #: OrchardCore.AdminDashboard\Views\Dashboard\Manage.cshtml:24
diff --git a/Localization/zh-Hans/OrchardCore.AdminMenu.po b/Localization/zh-Hans/OrchardCore.AdminMenu.po
index 85e329c6bc919..2860a167ea15d 100644
--- a/Localization/zh-Hans/OrchardCore.AdminMenu.po
+++ b/Localization/zh-Hans/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr "创建管理菜单 {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "名称"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr "添加节点"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr "编辑管理菜单: {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr "编辑节点"
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr "当两者都指向相同的 url 时, 要显示为激活状态的优先级。值最高的链接在导航中会拥有激活状态。"
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr "此链接在管理菜单中的位置顺序。"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "链接"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr "链接文本将在菜单中显示。"
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr "链接的URL地址，当链接本身或其子链接包含URL地址时才会显示；应设为管理根目录的相对地址。"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "选择一个图标"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr "占位符"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr "树形显示的菜单项文本"
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr "选择"
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr "选择要在此菜单项处于第一级时显示的图标。"
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "选择一个图标"
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr "权限"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr "要搜索的类型"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "选择"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "删除"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "未找到结果"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr "显示此菜单项所需的权限(可选)。"
diff --git a/Localization/zh-Hans/OrchardCore.Alias.po b/Localization/zh-Hans/OrchardCore.Alias.po
index 1b99ef0301b04..9c2514d5c5795 100644
--- a/Localization/zh-Hans/OrchardCore.Alias.po
+++ b/Localization/zh-Hans/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr "您的别名已被使用。\"{0}\""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "全文不包含有效的Liquid表达式。详细信息: {0}"
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr "留空以重新生成它。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr "别名自动生成且不可修改"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hans/OrchardCore.Apis.GraphQL.po b/Localization/zh-Hans/OrchardCore.Apis.GraphQL.po
index b8fff681eda25..b1f83fae38b9a 100644
--- a/Localization/zh-Hans/OrchardCore.Apis.GraphQL.po
+++ b/Localization/zh-Hans/OrchardCore.Apis.GraphQL.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:43\n"
+"PO-Revision-Date: 2023-09-09 05:25\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Apis.GraphQL\AdminMenu.cs:25
@@ -30,7 +30,7 @@ msgstr "GraphiQL"
 #: OrchardCore.Apis.GraphQL\ValidationRules\MaxNumberOfResultsValidationRule.cs:54
 msgctxt "OrchardCore.Apis.GraphQL.ValidationRules.MaxNumberOfResultsValidationRule"
 msgid "'{0}' exceeds the maximum number of results for '{1}' ({2})"
-msgstr ""
+msgstr "'{0}' 超过了'{1}' 的最大结果数量({2})"
 
 #. S["Authorization is required to access {0}.", operationName],
 #: OrchardCore.Apis.GraphQL\ValidationRules\RequiresPermissionValidationRule.cs:67
diff --git a/Localization/zh-Hans/OrchardCore.ArchiveLater.po b/Localization/zh-Hans/OrchardCore.ArchiveLater.po
index d207873539899..886fad033637a 100644
--- a/Localization/zh-Hans/OrchardCore.ArchiveLater.po
+++ b/Localization/zh-Hans/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr "稍后存档"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr "稍后取消存档"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/zh-Hans/OrchardCore.AuditTrail.po b/Localization/zh-Hans/OrchardCore.AuditTrail.po
index 32f02fe839a8b..3d2d897818263 100644
--- a/Localization/zh-Hans/OrchardCore.AuditTrail.po
+++ b/Localization/zh-Hans/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr "审计跟踪"
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr "所有类别"
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr "自定义时间范围"
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr "审计跟踪"
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr "修剪任务是否被禁用。"
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr "事件保留天数。"
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/zh-Hans/OrchardCore.Autoroute.po b/Localization/zh-Hans/OrchardCore.Autoroute.po
index 2594b223b6273..0c0d6a14a5c23 100644
--- a/Localization/zh-Hans/OrchardCore.Autoroute.po
+++ b/Localization/zh-Hans/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr "您的永久链接过长。永久链接最多只能是 {0} 个字符。"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr "选中以禁用此内容项。"
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr "选中可指定子内容项将被路由到绝对路径。"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hans/OrchardCore.BackgroundTasks.po b/Localization/zh-Hans/OrchardCore.BackgroundTasks.po
index f05c53aa3d137..af1a31149a191 100644
--- a/Localization/zh-Hans/OrchardCore.BackgroundTasks.po
+++ b/Localization/zh-Hans/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -38,13 +38,13 @@ msgstr "后台任务"
 #: OrchardCore.BackgroundTasks\Controllers\BackgroundTaskController.cs:107
 msgctxt "OrchardCore.BackgroundTasks.Controllers.BackgroundTaskController"
 msgid "Enabled"
-msgstr "已启用"
+msgstr "启用"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = "disabled" }
 #: OrchardCore.BackgroundTasks\Controllers\BackgroundTaskController.cs:108
 msgctxt "OrchardCore.BackgroundTasks.Controllers.BackgroundTaskController"
 msgid "Disabled"
-msgstr "已禁用"
+msgstr "禁用"
 
 #. await _notifier.SuccessAsync(H["The task has been updated."]);
 #: OrchardCore.BackgroundTasks\Controllers\BackgroundTaskController.cs:209
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr "高级"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr "标题"
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr "描述"
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -116,13 +116,13 @@ msgstr "任务时间表作为 cron 表达式。"
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:51
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Use Tenant Pipeline"
-msgstr ""
+msgstr "使用租户流水线"
 
 #. <span class="hint">@T["Whether or not the tenant pipeline should be built to configure endpoints and then executed to allow route urls generation in the background."]</span>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:53
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Whether or not the tenant pipeline should be built to configure endpoints and then executed to allow route urls generation in the background."
-msgstr ""
+msgstr "是否应该建造租户流水线来配置端点，然后执行以允许在后台生成路由URL。"
 
 #. <div><span asp-validation-for="LockTimeout" class="text-danger">@T["Invalid lock timeout value in the advanced tab"]</span></div>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:57
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "在高级标签中无效的锁定过期值"
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr "如果没有启用分布式锁功能则忽略。"
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/zh-Hans/OrchardCore.ContentFields.po b/Localization/zh-Hans/OrchardCore.ContentFields.po
index 0eece44cbb1e9..4fa8289511562 100644
--- a/Localization/zh-Hans/OrchardCore.ContentFields.po
+++ b/Localization/zh-Hans/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -308,7 +308,7 @@ msgstr "地址格式无效"
 #: OrchardCore.ContentFields\Settings\ContentPickerFieldSettingsDriver.cs:80
 msgctxt "OrchardCore.ContentFields.Settings.ContentPickerFieldSettingsDriver"
 msgid "Title Pattern does not contain a valid Liquid expression. Details: {0}"
-msgstr ""
+msgstr "标题模式不包含有效的 Liquid 表达式。详细信息: {0}"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(ContentPickerFieldSettingsViewModel.Stereotypes), S["Please provide a Stereotype."]);
 #: OrchardCore.ContentFields\Settings\ContentPickerFieldSettingsDriver.cs:91
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr "开关"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器上为此字段显示的提示文本。"
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr "没有内容项。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr "标准"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "未发布"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr "输入搜索内容"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr "选择"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr "移除"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr "没有找到结果"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "- 是否允许选择多个元素。"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr "显示所有内容类型"
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr "属于这些构造模式的全部内容类型"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr "要显示的内容类型。选择至少一个。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,17 +548,17 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器中显示此字段的提示文本。"
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
-msgstr ""
+msgstr "标题模式"
 
 #. <span class="hint">@T["The pattern used to render the title in content picker. With Liquid support."]</span>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:80
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The pattern used to render the title in content picker. With Liquid support."
-msgstr ""
+msgstr "在内容选择器中呈现标题的模式。支持Liquid"
 
 #. <option value="Localized" selected="@(currentEditor == "Localized")">@T["Localized"]</option>
 #: OrchardCore.ContentFields\Views\DateField-Localized.Option.cshtml:4
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr "本地化"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "-是否需要值。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器上为此字段显示的提示文本。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "是否需要值。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg富文本编辑器"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "输入编辑器选项，在保存时语言总是设置为“html”。"
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "选项文档"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "当从插入媒体时是否使用 url (默认情况下，插入短代码)。"
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "选项文档"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr "网址"
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr "链接文本"
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr "是否需要 url。"
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr "使用链接的 url"
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr "要为编辑器上的 url 显示的提示文本。"
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr "要为编辑器上的链接文本显示的提示文本。"
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr "当 url 的输入为空时显示的提示 (占位符)。"
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr "当文本输入为空时显示的提示 (占位符)。"
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr "创建内容项时建议的有效 url。"
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr "没有内容项。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr "标准"
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "未发布"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr "输入搜索内容"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr "选择"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr "删除"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr "未找到结果。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr "- 是否允许选择多个元素。"
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr "要显示的内容类型。选择至少一个。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr "复选框列表"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr "要搜索的类型"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr "选择"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr "删除"
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr "未找到值"
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ", "
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "值是必需的"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr "编辑数据"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "允许值的 JSON 形式，例如 {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr "范围"
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr "无"
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr "旋转"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "是否需要值。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器上为此字段显示的提示文本。"
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr "当输入为空时显示的提示。(可选)"
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr "小数点后的位数。"
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr "允许的最小值。（可选）"
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr "允许的最大值。（可选）"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr "网址"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr "H6"
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr "输入编辑器选项。"
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr "选项文档"
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr "编辑数据"
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "被允许的值的 json 表示形式, 例如 {0}"
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "是否需要值。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,25 +1523,25 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器上为此字段显示的提示文本。"
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
-msgstr ""
+msgstr "默认值"
 
 #. <span class="hint">@T["The default value. (optional)"]</span>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
-msgstr ""
+msgstr "默认值(可选)"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "是否需要值。"
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr "对于秒，使用能被60整除的，例如15；对于毫秒，使用整数除以1000，保留三位小数，例如0.250。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr "没有用户。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr "标准的"
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr "未启用"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr "要搜索的类型"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr "选择"
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr "删除"
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr "未找到结果"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr "是否允许选择多个元素。"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr "是否允许选取者显示所有角色的用户。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器中显示此字段的提示文本。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr "必填"
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr "是否需要值。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr "提示"
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器上为此字段显示的提示文本。"
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr "宽度"
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr "Videobox 的宽度"
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr "高度"
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr "Videobox 的高度"
diff --git a/Localization/zh-Hans/OrchardCore.ContentLocalization.po b/Localization/zh-Hans/OrchardCore.ContentLocalization.po
index e7253daa4b30f..04fc832fc1a21 100644
--- a/Localization/zh-Hans/OrchardCore.ContentLocalization.po
+++ b/Localization/zh-Hans/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr "无法创建内容项本地化版本。"
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
@@ -152,7 +152,7 @@ msgstr "设置基于本地化部分文化的本地化cookie在前端访问页面
 #: OrchardCore.ContentLocalization\Views\Items\ContentsAdminFilters-Culture.Thumbnail.cshtml:6
 msgctxt "OrchardCore.ContentLocalization.Views.Items.ContentsAdminFilters-Culture.Thumbnail"
 msgid "Culture"
-msgstr ""
+msgstr "文化"
 
 #. <p>@T["Filters on a content items localization culture."]</p>
 #: OrchardCore.ContentLocalization\Views\Items\ContentsAdminFilters-Culture.Thumbnail.cshtml:8
diff --git a/Localization/zh-Hans/OrchardCore.ContentPreview.po b/Localization/zh-Hans/OrchardCore.ContentPreview.po
index 38cbd3ffd31a9..9550e67f246ad 100644
--- a/Localization/zh-Hans/OrchardCore.ContentPreview.po
+++ b/Localization/zh-Hans/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "模式不包含有效的 Liquid 表达式。详细信息： {0}"
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "预览"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr "断开连接 预览"
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr "预览错误"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hans/OrchardCore.ContentTypes.po b/Localization/zh-Hans/OrchardCore.ContentTypes.po
index ecfef193759fd..8eb181e8be365 100644
--- a/Localization/zh-Hans/OrchardCore.ContentTypes.po
+++ b/Localization/zh-Hans/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr "内容零件"
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr "显示名称不能为空。"
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr "具有相同显示名称的类型已存在。"
@@ -66,10 +66,10 @@ msgstr "具有相同显示名称的类型已存在。"
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr "技术名称不能为空。"
@@ -78,10 +78,10 @@ msgstr "技术名称不能为空。"
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr "技术名称必须以字母开头。"
@@ -90,10 +90,10 @@ msgstr "技术名称必须以字母开头。"
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr "技术名称包含无效字符。"
@@ -101,133 +101,133 @@ msgstr "技术名称包含无效字符。"
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr "技术名称保留给内部使用。"
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr "具有相同技术名称的类型已存在。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr "已创建 \"{0}\" 内容类型。"
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr "已保存 \"{0}\" 设置。"
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr "\"{0}\" 已被删除。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr "添加了 \"{0}\" 零件。"
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr "已存在具有相同显示名称的部件。"
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr "已经存在具有相同技术名称的部件。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr "\"{0}\" 零件已被删除。"
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr "无法创建内容零件。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr "已创建 \"{0}\" 内容零件。"
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr "已保存 \"{0}\" 的设置。"
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr "没有字段。"
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr "具有相同显示名称的字段已存在。"
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr "具有相同技术名称的字段已存在。"
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr "添加了字段 \"{0}\"。"
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr "显示名称更改为 {0}。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr "已保存 \"{0}\" 字段设置。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr "\"{0}\" 字段已被删除。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr "已保存 \"{0}\" 零件设置。"
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr "内容类型名称不能为空。"
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr "无法添加名为 \"{0}\" 的零件。它已经存在。"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr "将新字段添加到 \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "将在屏幕中显示的字段的名称。"
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr "将命名零件添加到 \"{0}\""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr "可重复使用零件的名称, 因为它将显示在屏幕中。"
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr "可重复使用零件的技术名称。"
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr "导出指定的内容类型和零件定义。"
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr "零件的技术名称。"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr "将在屏幕中显示的零件的名称。留空以使用默认值。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr "检查以允许此零件连接多次。"
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr "类型的技术名称。"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "将在屏幕上显示的类型的名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr "新的内容类型"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr "将在屏幕上显示的类型的名称。"
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr "新内容零件"
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr "创建"
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr "要删除的内容类型定义列表用逗号分隔。"
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr "导出指定的内容类型和要删除的零件定义。"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr "编辑内容类型- {0}"
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr "字段"
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "编辑"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr "删除"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr "显示模式"
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr "编辑器"
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr "添加字段"
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr "零件"
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr "包含当前类型的字段"
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr "添加零件"
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr "添加命名零件"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr "保存"
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr "删除"
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr "{0}\"{1}\"的设置"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr "将在屏幕中显示的字段的名称。"
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr "字段的技术名称。"
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr "应该使用哪种类型的编辑器？"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr "应使用哪种类型的显示模式？"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr "保存"
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "取消"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr "所有类型通用的某些零件设置也可以在 <a href=\"{0}\">零件定义</a> 级别中定义。"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr "将在屏幕中显示的零件的名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr "将在屏幕中显示的零件的说明。"
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr "应该使用哪种类型的编辑器？"
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr "应使用哪种显示模式？"
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr "保存"
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "取消"
diff --git a/Localization/zh-Hans/OrchardCore.Contents.po b/Localization/zh-Hans/OrchardCore.Contents.po
index 1bd78981f9494..08a29278cbbd1 100644
--- a/Localization/zh-Hans/OrchardCore.Contents.po
+++ b/Localization/zh-Hans/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} 已未发布。"
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "所有内容类型"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr "发生了一个或多个验证错误。"
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr "导出审计跟踪设置。"
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "内容"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "完成"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr "审计跟踪"
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr "编辑时是否显示审计线索注释。"
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr "创建或首次发布内容项的日期。"
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr "选中此项才能编辑内容项的作者。 <code>编辑内容作者</code> 权限也是必需的。"
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr "发布并继续"
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "操作"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "所有内容格式"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "任何内容类型"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr "内容"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "任何内容类型"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr "内容草稿已保存。"
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr "内容条目"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "任何内容类型"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1295,7 +1295,7 @@ msgstr "您确定要 {0} 这些项目吗？"
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-ContentType.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-ContentType.Thumbnail"
 msgid "Content Type"
-msgstr ""
+msgstr "内容类型"
 
 #. <p>@T["Filters on a specified content type."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-ContentType.Thumbnail.cshtml:8
@@ -1307,7 +1307,7 @@ msgstr "筛选指定内容类型。"
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-DisplayText.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-DisplayText.Thumbnail"
 msgid "Display Text"
-msgstr ""
+msgstr "显示文本"
 
 #. <p>@T["Filters on the Display Text of a content item."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-DisplayText.Thumbnail.cshtml:8
@@ -1319,7 +1319,7 @@ msgstr "在内容项的显示文本上进行过滤。"
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Sort.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Sort.Thumbnail"
 msgid "Sort"
-msgstr ""
+msgstr "排序"
 
 #. <p>@T["Orders by a content item value."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Sort.Thumbnail.cshtml:8
@@ -1331,7 +1331,7 @@ msgstr "按内容项值排序。"
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Status.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Status.Thumbnail"
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. <p>@T["Filters on a content item status."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Status.Thumbnail.cshtml:8
@@ -1343,13 +1343,13 @@ msgstr "对内容项状态的过滤。"
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Stereotype.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Stereotype.Thumbnail"
 msgid "Content Type Stereotype"
-msgstr ""
+msgstr "内容类型构造型"
 
 #. <p>@T["Filters on a specified content type stereotype."]</p>
 #: OrchardCore.Contents\Views\Items\ContentsAdminFilters-Stereotype.Thumbnail.cshtml:8
 msgctxt "OrchardCore.Contents.Views.Items.ContentsAdminFilters-Stereotype.Thumbnail"
 msgid "Filters on a specified content type stereotype."
-msgstr ""
+msgstr "对特定内容类型构造型的过滤器。"
 
 #. @T["No results found."]
 #: OrchardCore.Contents\Views\ContentsAdminList.cshtml:46
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr "显示所有内容类型"
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr "选择一个图标"
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr "显示所有内容类型"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr "限制从此源提供的内容项的数量。注意：选择此选项时，只有一种内容类型是可选的。"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr "这些内容类型可能变更的默认频率。"
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr "全部"
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "任何内容类型"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "任何内容类型"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr "任何内容类型"
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr "创建内容"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr "检查是否要在创建时发布内容项。不选中以创建草稿版本。"
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr "删除内容使用表达式: <em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "取消"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr "以 JSON 格式查看草稿"
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr "下载草稿为 JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr "以JSON格式查看"
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr "下载已发布的 JSON"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr "以 JSON 格式查看"
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "取消"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr "没有找到部署目标计划的导出内容。创建部署计划并为部署目标步骤添加导出内容。"
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr "内容"
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr "新建"
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr "发布内容使用表达式：<em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr "使用表达式获取内容： <em>{0}</em>"
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr "取消发布内容使用表达式：<em>{0}</em>"
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr "使用表达式更新内容： <em>{0}</em>"
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr "输入要更新的 JavaScript 表达式，用于对内容项 ID (ContentItemId) 进行评估。例如：correlationId()。"
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/zh-Hans/OrchardCore.CustomSettings.po b/Localization/zh-Hans/OrchardCore.CustomSettings.po
index a530bead24a33..c7206c3bd39d3 100644
--- a/Localization/zh-Hans/OrchardCore.CustomSettings.po
+++ b/Localization/zh-Hans/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr "自定义设置"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "全部"
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/zh-Hans/OrchardCore.Data.YesSql.po b/Localization/zh-Hans/OrchardCore.Data.YesSql.po
index ca1924c6342c1..039c8f3d9b052 100644
--- a/Localization/zh-Hans/OrchardCore.Data.YesSql.po
+++ b/Localization/zh-Hans/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr "删除表失败。"
diff --git a/Localization/zh-Hans/OrchardCore.Demo.po b/Localization/zh-Hans/OrchardCore.Demo.po
index 934f43d5076b2..ac6e4619b8bdb 100644
--- a/Localization/zh-Hans/OrchardCore.Demo.po
+++ b/Localization/zh-Hans/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr "名字"
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr "姓氏"
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/zh-Hans/OrchardCore.Deployment.Remote.po b/Localization/zh-Hans/OrchardCore.Deployment.Remote.po
index dabf1ec0f87f7..6c01545661433 100644
--- a/Localization/zh-Hans/OrchardCore.Deployment.Remote.po
+++ b/Localization/zh-Hans/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr "将部署计划发送到远程实例。"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr "客户姓名"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr "创建远程实例"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr "网址"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr "客户端名称"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr "编辑远程客户端"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr "客户端名称"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr "编辑远程实例"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr "网址"
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr "客户端名称"
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/zh-Hans/OrchardCore.Deployment.po b/Localization/zh-Hans/OrchardCore.Deployment.po
index 5c34cfc265dcc..196232ede6fa9 100644
--- a/Localization/zh-Hans/OrchardCore.Deployment.po
+++ b/Localization/zh-Hans/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr "JSON 导入"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr "删除"
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr "部署计划已成功删除。"
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr "该名称是必需的。"
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr "已存在具有相同名称的部署计划。"
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr "部署计划更新成功。"
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr "成功删除部署计划。"
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr "创建部署计划"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr "要作为计划的一部分添加的内容类型。"
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr "将在存档中添加的文件名。"
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr "部署计划"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "所有"
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr "编辑部署计划"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr "JSON 配方"
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr "要添加作为计划的一部分的配方文件。"
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr "配方名称。"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr "配方显示名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr "配方描述。"
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr "配方作者"
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr "配方网站。"
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr "配方版本。"
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr "配方类别 (逗号分隔值)。"
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/zh-Hans/OrchardCore.Diagnostics.po b/Localization/zh-Hans/OrchardCore.Diagnostics.po
index 84ef4c9a4ab5c..ccbbbfc6428e6 100644
--- a/Localization/zh-Hans/OrchardCore.Diagnostics.po
+++ b/Localization/zh-Hans/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 19:33\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
-msgstr "您的浏览器发送了一个此服务器无法理解的请求。"
-
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr "执行此请求时出错。"
+msgstr ""
 
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
-msgstr "您无权访问此资源。"
+msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
-msgstr "找不到该页。"
+msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
-msgstr "您无权查看此内容。"
+msgstr ""
+
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
 
diff --git a/Localization/zh-Hans/OrchardCore.Email.Abstractions.po b/Localization/zh-Hans/OrchardCore.Email.Abstractions.po
index 2b9db78037b00..12d1dd1e62c22 100644
--- a/Localization/zh-Hans/OrchardCore.Email.Abstractions.po
+++ b/Localization/zh-Hans/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-01-12 21:09\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "{0} 字段是必需的。"
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "不支持 '{0}''执行方式。"
diff --git a/Localization/zh-Hans/OrchardCore.Email.po b/Localization/zh-Hans/OrchardCore.Email.po
index 3326fba6c0848..164e8f9e8e8bc 100644
--- a/Localization/zh-Hans/OrchardCore.Email.po
+++ b/Localization/zh-Hans/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -42,28 +42,28 @@ msgstr "消息发送成功。"
 #: OrchardCore.Email\ViewModels\SmtpSettingsViewModel.cs:10
 msgctxt "OrchardCore.Email.ViewModels.SmtpSettingsViewModel"
 msgid "Invalid Email."
-msgstr ""
+msgstr "无效的电子邮件"
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr "电子邮件任务"
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr "消息"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr "失败"
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr "发送电子邮件"
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr "邮件作者的电子邮件地址，留空时将使用默认电子邮件地址。支持Liquid。"
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr "发件人的电子邮件地址。如果与\"发件人\"电子邮件地址不相同则需要。支持Liquid"
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr "\"回复\"电子邮件地址。如果您想要将电子邮件回复发送到不同于\"发件人\"地址。支持Liquid"
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr "以逗号分隔的收件人电子邮件地址列表。支持Liquid。"
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr "以逗号分隔的收件人电子邮件地址列表。支持Liquid。"
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr "以逗号分隔的收件人电子邮件地址列表。支持Liquid。"
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr "如果选中此项，显示邮件正文将以 HTML格式发送。"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "设置"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr "发送至"
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr "实际发件人是可选的，当邮件作者与发送者不同时设置。"
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr "密送"
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr "抄送"
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr "回复到"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr "主题"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr "主体"
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "保存设置后, 将重新加载当前租户。"
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr "如果未设置实际发件人，此地址将作为默认的实际发件人。"
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr "网络传递选项"
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr "SMTP 服务器域, 例如, <i>smtp.mailprovider.com</i>。"
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr "SMTP 服务器端口, 通常为25。"
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr "代理服务器是可选的。"
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr "代理端口是可选的。"
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr "当选择此选项时，应用程序池或主机进程身份将用于通过邮件服务器进行身份验证。"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr "身份验证的用户名。"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr "指定的拾取目录传递选项"
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr "例如 <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> 将电子邮件放在 C 驱动器上 <i>PickedUpEmail</i> 目录中。"
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/zh-Hans/OrchardCore.Facebook.po b/Localization/zh-Hans/OrchardCore.Facebook.po
index 1fac4c31c5de1..f753caf2bb501 100644
--- a/Localization/zh-Hans/OrchardCore.Facebook.po
+++ b/Localization/zh-Hans/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr "Facebook正文不包含有效的 Liquid 表达式。详细信息： {0}"
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "Facebook正文不包含有效的 Liquid 表达式。详细信息： {0}"
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr "登录设置"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "应用程序的基路径内将返回用户代理的请求路径。中间件到达时将处理此请求。"
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr "使用 Liquid 模板语言的插件模板。"
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr "Javascript SDK 版本"
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr "在每个页面上初始化"
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/zh-Hans/OrchardCore.Features.po b/Localization/zh-Hans/OrchardCore.Features.po
index 212286f7e59ef..3ab4590ad2385 100644
--- a/Localization/zh-Hans/OrchardCore.Features.po
+++ b/Localization/zh-Hans/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr "功能"
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr "请选择一个或多个功能。"
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr "此功能总是启用，不能被禁用。"
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr "{0} 已 {1}."
@@ -125,9 +125,9 @@ msgstr "批量操作"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr "禁用"
@@ -136,8 +136,8 @@ msgstr "禁用"
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr "启用"
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr "未分类"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr "此功能基于依赖关系自动启用，不能手动禁用。"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr "此功能因依赖关系而自动禁用，无法手动启用。"
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr "此功能总是启用，无法手动禁用。"
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr "禁用 {0} 功能也会禁用以下依赖它的功能：{1}，确认吗？"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr "禁用功能"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr "是"
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr "否"
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr "<strong>没有任何内容！</strong> 您的搜索返回没有结果。"
diff --git a/Localization/zh-Hans/OrchardCore.Flows.po b/Localization/zh-Hans/OrchardCore.Flows.po
index c641dc4589620..28fb83177ff78 100644
--- a/Localization/zh-Hans/OrchardCore.Flows.po
+++ b/Localization/zh-Hans/OrchardCore.Flows.po
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
-msgstr ""
+msgstr "Id为 {0} 的小部件内容项没有匹配的 {1} 内容类型定义。"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType]);
 #: OrchardCore.Flows\Drivers\FlowPartDisplayDriver.cs:73
@@ -46,13 +46,13 @@ msgstr "FlowPart允许直接在其他内容项目中添加内容项"
 #: OrchardCore.Flows\Settings\BagPartSettingsDisplayDriver.cs:63
 msgctxt "OrchardCore.Flows.Settings.BagPartSettingsDisplayDriver"
 msgid "Content type source must be set with a valid value."
-msgstr ""
+msgstr "内容类型源必须设置为有效值。"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.Stereotypes), S["Please provide a Stereotype."]);
 #: OrchardCore.Flows\Settings\BagPartSettingsDisplayDriver.cs:74
 msgctxt "OrchardCore.Flows.Settings.BagPartSettingsDisplayDriver"
 msgid "Please provide a Stereotype."
-msgstr ""
+msgstr "请输入一个构造模式。"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.ContainedContentTypes), S["At least one content type must be selected."]);
 #: OrchardCore.Flows\Settings\BagPartSettingsDisplayDriver.cs:91
@@ -64,7 +64,7 @@ msgstr "至少必须选择一个内容类型。"
 #: OrchardCore.Flows\Views\BagPart.Edit.cshtml:69
 msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add {0}"
-msgstr ""
+msgstr "添加 {0}"
 
 #. @T["Add Item"]
 #: OrchardCore.Flows\Views\BagPart.Edit.cshtml:75
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr "添加项目"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -90,19 +90,19 @@ msgstr "包含的内容类型"
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Content Types"
-msgstr ""
+msgstr "内容类型"
 
 #. @T["Stereotype"] <span class="hint">@T["All content types of these Stereotypes"]</span>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotype"
-msgstr ""
+msgstr "构造型"
 
 #. @T["Stereotype"] <span class="hint">@T["All content types of these Stereotypes"]</span>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "All content types of these Stereotypes"
-msgstr ""
+msgstr "属于这些构造模式的全部内容类型"
 
 #. <span class="hint">@T["The content types that this bag can contain, e.g. Slide for a Slide Show."]</span>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:24
@@ -110,19 +110,19 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr "此包可以包含的内容类型, 例如幻灯片放映。"
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
-msgstr ""
+msgstr "构造型"
 
 #. <span class="hint">@T["The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"]</span>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
-msgstr ""
+msgstr "该字段能包含的内容类型的构造模式。您可以使用英文逗号 (,) 隔开来定义多个构造模式"
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -138,7 +138,7 @@ msgstr "呈现内容项时要使用的显示类型。默认为摘要。"
 #: OrchardCore.Flows\Views\ContentCard-BagPart.Edit.cshtml:24
 msgctxt "OrchardCore.Flows.Views.ContentCard-BagPart.Edit"
 msgid "{0} <span class=\"hint dashed\">{1}</span>"
-msgstr ""
+msgstr "{0} <span class=\"hint dashed\">{1}</span>"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
 #: OrchardCore.Flows\Views\ContentCard-BagPart.Edit.cshtml:29
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr "插入挂件"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr "删除"
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr "您确定要删除这个项目吗？"
@@ -210,37 +210,37 @@ msgstr "对齐"
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "25%"
-msgstr ""
+msgstr "25%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_33" type="radio" autocomplete="off" value="33">@T["33%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:33
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "33%"
-msgstr ""
+msgstr "33%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_50" type="radio" autocomplete="off" value="50">@T["50%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:36
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_66" type="radio" autocomplete="off" value="66">@T["66%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:39
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "66%"
-msgstr ""
+msgstr "66%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_75" type="radio" autocomplete="off" value="75">@T["75%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:42
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "75%"
-msgstr ""
+msgstr "75%"
 
 #. <input class="d-none" asp-for="Size" id="@Html.IdFor(x => x.Size)_100" type="radio" autocomplete="off" value="100">@T["100%"]
 #: OrchardCore.Flows\Views\FlowMetadata.Edit.cshtml:45
 msgctxt "OrchardCore.Flows.Views.FlowMetadata.Edit"
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
 #. <button type="button" title="@T["Add Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Flows\Views\FlowPart.Edit.cshtml:66
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr "没有找到挂件。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/zh-Hans/OrchardCore.Forms.po b/Localization/zh-Hans/OrchardCore.Forms.po
index facc0d0639589..45a112ff26643 100644
--- a/Localization/zh-Hans/OrchardCore.Forms.po
+++ b/Localization/zh-Hans/OrchardCore.Forms.po
@@ -10,13 +10,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
 msgctxt "OrchardCore.Forms.Drivers.FormInputElementPartDisplayDriver"
 msgid "A value is required for Name."
-msgstr ""
+msgstr "名称需要一个值。"
 
 #. updater.ModelState.AddModelError(Prefix + '.' + nameof(SelectPartEditViewModel.Options), S["The options are written in an incorrect format."]);
 #: OrchardCore.Forms\Drivers\SelectPartDisplayDriver.cs:60
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr "选项格式错误。"
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr "添加模型验证错误任务"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr "验证"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr "绑定模式状态任务"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr "验证"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr "验证 Antiforgery 令牌任务"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr "验证"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr "无效"
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr "验证表单字段任务"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr "验证"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr "无效"
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr "验证表单任务"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr "验证"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr "无效"
@@ -154,9 +178,9 @@ msgstr "添加表单验证错误"
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Design.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design"
 msgid "<em>{0}</em>: <em>{1}</em>"
-msgstr ""
+msgstr "<em>{0}</em> <em>{1}</em>"
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr "具有无效值的窗体域的名称。"
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr "将提交的表单字段绑定到模型状态。"
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr "按钮上显示的文本"
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,53 +258,53 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr "按钮类型"
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
-msgstr ""
+msgstr "标签选项"
 
 #. <option value="@LabelOptions.None">@T["None"]</option>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #. <option value="@LabelOptions.Standard">@T["Standard"]</option>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Standard"
-msgstr ""
+msgstr "标准"
 
 #. <option value="@LabelOptions.ScreenReaders">@T["Screen Readers"]</option>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Screen Readers"
-msgstr ""
+msgstr "屏幕阅读器"
 
 #. <span class="hint">@T["The type of label to create for this field."]</span>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:18
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
-msgstr ""
+msgstr "要为此字段创建的标签类型。"
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
-msgstr ""
+msgstr "标签文本"
 
 #. <span class="hint">@T["The text to display in the label."]</span>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
-msgstr ""
+msgstr "在标签中显示的文本。"
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. <span class="hint">@T["The ID to render on this form element."]</span>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:9
@@ -288,31 +312,31 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr "要在此表单元素上呈现的ID。"
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
-msgstr ""
+msgstr "验证选项"
 
 #. <option value="@ValidationOptions.None">@T["None"]</option>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #. <option value="@ValidationOptions.Standard">@T["Standard"]</option>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Standard"
-msgstr ""
+msgstr "标准"
 
 #. <span class="hint">@T["The type of validation to create for this field."]</span>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
-msgstr ""
+msgstr "要为此字段创建的验证类型。"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr "要在此表单元素上呈现的名称。"
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr "要将表单提交到的URL。"
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr "提交表单时使用的HTTP方法。"
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr "选中以生成表单中的防伪令牌。"
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr "按钮类型"
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr "字段没有值时显示的文本。"
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr "字段的默认值"
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr "编辑数据"
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "允许值的 JSON 形式，例如 {0}"
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,37 +706,37 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
-msgstr ""
+msgstr "编辑器"
 
 #. <option value="@SelectEditorOption.Dropdown">@T["Dropdown"]</option>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:113
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Dropdown"
-msgstr ""
+msgstr "下拉列表"
 
 #. <option value="@SelectEditorOption.Checkbox">@T["Checkbox"]</option>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:114
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Checkbox"
-msgstr ""
+msgstr "复选框"
 
 #. <option value="@SelectEditorOption.Radio">@T["Radio"]</option>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:115
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Radio"
-msgstr ""
+msgstr "单选"
 
 #. <span class="hint">@T["The editor style to use for this field."]</span>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:117
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
-msgstr ""
+msgstr "用于此字段的编辑器样式。"
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr "textarea没有值时显示的文本。"
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -725,7 +791,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr "验证 <em>{0}</em>"
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -737,7 +803,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr "要验证的表单域的名称。"
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -779,7 +845,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr "检查提交的表单是否包含任何验证错误。"
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
@@ -795,11 +861,11 @@ msgstr "此验证所用的字段名称。"
 #: OrchardCore.Forms\Views\Items\ValidationSummaryPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.ValidationSummaryPart.Fields.Edit"
 msgid "Show Model Only Error"
-msgstr ""
+msgstr "仅显示模型错误"
 
 #. <div class="hint">@T["When checked, model level errors will be visible otherwise all errors will be visible."]</div>
 #: OrchardCore.Forms\Views\Items\ValidationSummaryPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ValidationSummaryPart.Fields.Edit"
 msgid "When checked, model level errors will be visible otherwise all errors will be visible."
-msgstr ""
+msgstr "如果选中此项，模型级别的错误将会可见，否则所有错误都会可见。"
 
diff --git a/Localization/zh-Hans/OrchardCore.GitHub.po b/Localization/zh-Hans/OrchardCore.GitHub.po
index 426eb150bafcc..92c9a87cb4825 100644
--- a/Localization/zh-Hans/OrchardCore.GitHub.po
+++ b/Localization/zh-Hans/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr "GitHub 身份验证设置"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr "您的一般标签页中定义的客户ID <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub 应用程序</a>。"
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr "您的应用程序的密钥。"
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/zh-Hans/OrchardCore.Google.po b/Localization/zh-Hans/OrchardCore.Google.po
index af3b207e565f4..e61ee87d982c7 100644
--- a/Localization/zh-Hans/OrchardCore.Google.po
+++ b/Localization/zh-Hans/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr "谷歌分析配置文件"
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr "更新认证设置"
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr "Google API 控制台为应用程序定义客户端ID。"
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr "应用程序在Google API控制台中定义的客户端密钥。"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/zh-Hans/OrchardCore.Html.po b/Localization/zh-Hans/OrchardCore.Html.po
index 05f89fea7a025..fee8c61ee0e0e 100644
--- a/Localization/zh-Hans/OrchardCore.Html.po
+++ b/Localization/zh-Hans/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg富文本编辑器"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr "内容项的正文。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr "输入编辑器选项，在保存时语言总是设置为“html”。"
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr "选项文档"
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr "当从插入媒体时是否使用 url (默认情况下，插入短代码)。"
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr "输入编辑器选项"
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr "选项文档"
diff --git a/Localization/zh-Hans/OrchardCore.Https.po b/Localization/zh-Hans/OrchardCore.Https.po
index e7643f2ee394c..1c2900404ce8c 100644
--- a/Localization/zh-Hans/OrchardCore.Https.po
+++ b/Localization/zh-Hans/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 19:38\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr "指定当重定向到 HTTPS 时, 是否应使用永久重定向, 而不是临时重新定向、307 Found。"
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/zh-Hans/OrchardCore.Infrastructure.Abstractions.po b/Localization/zh-Hans/OrchardCore.Infrastructure.Abstractions.po
index fba1924a87384..4af1b3842462e 100644
--- a/Localization/zh-Hans/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/zh-Hans/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-01-12 21:13\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr "找不到开关\"{0}\""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr "属性\"{0}\"存在，但不用\"{1}\"修饰"
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr "将值{0}\" 到 \"{1}\" 转换为 \"{2} \" 时出错"
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr "命令参数“{0}”与命令定义不匹配"
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr "方法\"{0}\"不支持开关\"{1}\"。"
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/zh-Hans/OrchardCore.Layers.po b/Localization/zh-Hans/OrchardCore.Layers.po
index 7b5ab6ea7cec3..f604f82aabba3 100644
--- a/Localization/zh-Hans/OrchardCore.Layers.po
+++ b/Localization/zh-Hans/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr "创建图层"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr "描述"
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr "编辑层- {0}"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr "更新规则顺序出错"
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr "保存"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr "编辑小部件和图层"
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr "部件已成功移动。 <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>撤消</strong></a>。"
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr "区域"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr "请在添加部件前 <a href=\"{0}\">定义可用区域</a>"
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr "添加部件"
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr "没有找到挂件。"
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr "未找到图层。"
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr "图层"
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr "选择一个图层以显示其关联的小部件。"
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr "查看文档"
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr "编辑"
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr "删除"
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr "请 <a href=\"{0}\">在添加小部件之前创建一个层</a>"
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr "添加"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr "-如果选中, 标题将与小部件一起呈现。"
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr "构件应与之关联的图层。"
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/zh-Hans/OrchardCore.Liquid.po b/Localization/zh-Hans/OrchardCore.Liquid.po
index 5175603826d72..3c73ce16bfe0e 100644
--- a/Localization/zh-Hans/OrchardCore.Liquid.po
+++ b/Localization/zh-Hans/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 19:40\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "模板不包含有效的 Liquid 表达式。详细信息： {0}"
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/zh-Hans/OrchardCore.Lists.po b/Localization/zh-Hans/OrchardCore.Lists.po
index dc62d990dbacf..45fc9d4d50900 100644
--- a/Localization/zh-Hans/OrchardCore.Lists.po
+++ b/Localization/zh-Hans/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr "表示父内容项目的链接，以及内容项目的代表顺序。"
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr "表示内容项的集合。"
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr "指定的博客帖子不再存在。请创建一个新的博客帖子。"
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr "未授权删除此内容"
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr "提供的用户名或电子邮件或密码不正确。"
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr "该清单为空"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr "禁用 RSS Feed 链接生成。"
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr "当前的源可用于 <a href=\"{0}\" target=\"_blank\">{0}</a>。"
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr "新建"
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr "选中此选项可启用手动排序项目。"
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr "列表"
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr "添加父菜单项"
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/zh-Hans/OrchardCore.Localization.po b/Localization/zh-Hans/OrchardCore.Localization.po
index c7554f7d88ec3..dff4fc3425fd7 100644
--- a/Localization/zh-Hans/OrchardCore.Localization.po
+++ b/Localization/zh-Hans/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr "文化"
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr "区域性是必须的"
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr "已重新启动网站, 以使设置生效."
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr "已为站点配置的活动区域。"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr "文化设置"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr "导出文化设置。"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr "添加区域"
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/zh-Hans/OrchardCore.Markdown.po b/Localization/zh-Hans/OrchardCore.Markdown.po
index cfb61c1677a4b..bc3dfc8ff517d 100644
--- a/Localization/zh-Hans/OrchardCore.Markdown.po
+++ b/Localization/zh-Hans/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr "{0} 不包含有效的 Liquid 表达式。详细信息: {1}"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg富文本编辑器"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr "内容项目的正文，以Markdown格式。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr "Wysiwyg富文本编辑器"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/zh-Hans/OrchardCore.Media.po b/Localization/zh-Hans/OrchardCore.Media.po
index b869b90ae37b9..d576838674bb4 100644
--- a/Localization/zh-Hans/OrchardCore.Media.po
+++ b/Localization/zh-Hans/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr "无法移动媒体，因为已存在具有相同名称的文件"
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr "已存在具有相同名称的配置文件。"
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr "媒体配置文件已成功删除。"
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr "媒体配置文件已成功删除。"
@@ -181,95 +181,95 @@ msgstr "媒体配置文件已成功删除。"
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr "默认"
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr "自定义大小"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr "默认 (最大)"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr "最大"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr "裁剪"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr "平板"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr "盒子"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr "最小"
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr "拉伸"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr "Bmp"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr "Gif"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr "Jpg"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr "Png"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr "Tga"
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr "WebP"
@@ -280,11 +280,11 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr "{0}：文件处理时出错。"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
-msgstr ""
+msgstr "不允许媒体扩展。只允许带有“{0}”的扩展名的媒体。"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["{0}: A media is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:140
@@ -316,11 +316,11 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr "是否从顶部目录或者从所有子目录获取资产。"
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
-msgstr ""
+msgstr "请选择至少一个扩展名。"
 
 #. <h5>@T["All Media Profiles"]</h5>
 #: OrchardCore.Media\Views\Items\AllMediaProfilesDeploymentStep.Edit.cshtml:3
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr "创建媒体配置文件"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr "媒体配置的名称。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr "媒体配置的提示。"
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "选择已处理图像的宽度。默认值意味着将不应用宽度命令。"
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "选择已处理图像的高度。默认值意味着将不应用高度命令。"
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr "选择已处理图像的调整大小模式。"
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr "选择已处理图像的背景颜色。空值表示将不应用bg颜色命令。 有效值示例：“白”、“ff00”、“ffff0080”、“128,664,32”和“128,64,32,80”。"
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "选择已处理图像的格式。默认值意味着不会应用格式命令。"
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr "编辑媒体配置文件"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr "媒体配置的名称。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr "媒体配置的提示。"
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr "选择已处理图像的宽度。默认值意味着将不应用宽度命令。"
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr "选择已处理图像的高度。默认值意味着将不应用高度命令。"
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr "选择已处理图像的调整大小模式。"
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr "选择已处理图像的背景颜色。空值表示将不应用bg颜色命令。 有效值示例：“白”、“ff00”、“ffff0080”、“128,664,32”和“128,64,32,16”。"
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr "选择已处理图像的格式。默认值意味着不会应用格式命令。"
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr "反向选择"
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr "新建文件夹"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr "重命名项目"
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr "媒体"
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr "所有"
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,46 +1083,46 @@ msgid "Exports all or specified media."
 msgstr "导出所有或指定的媒体。"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr " 小缩略图"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr " 大缩略图"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
-msgstr ""
+msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
-msgstr ""
+msgstr "此文件超过最大上传大小"
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
-msgstr ""
+msgstr "上传"
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
-msgstr ""
+msgstr "错误"
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
-msgstr ""
+msgstr "清除错误"
 
 #. <option value="Attached" selected="@(currentEditor == "Attached")">@T["Attached"]</option>
 #: OrchardCore.Media\Views\MediaField-Attached.Option.cshtml:4
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr "已附加"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr " 小缩略图"
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr " 大缩略图"
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
-msgstr ""
+msgstr "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr "选择媒体"
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "确定"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1224,7 +1224,7 @@ msgstr "保存时将丢弃"
 #: OrchardCore.Media\Views\Shared\MediaFieldEditLocalization.cshtml:11
 msgctxt "OrchardCore.Media.Views.Shared.MediaFieldEditLocalization"
 msgid "No Files"
-msgstr ""
+msgstr "无文件"
 
 #. <h5 class="modal-title">@T["Enter media text"]</h5>
 #: OrchardCore.Media\Views\Shared\MediaFieldEditMediaTextModal.cshtml:5
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr "是否允许选择一个锚点来调整大小。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
@@ -1308,25 +1308,25 @@ msgstr "要在编辑器上显示的提示文本。"
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Allow all default media types"
-msgstr ""
+msgstr "允许所有默认媒体类型"
 
 #. <span class="hint dashed">@T["This will allow the user to attach any accessible file from the media library."]</span>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "This will allow the user to attach any accessible file from the media library."
-msgstr ""
+msgstr "这将允许用户从媒体库附加任何可访问的文件。"
 
 #. <label class="form-check-label cursor-pointer" for="@htmlId">@T["{0} types", group.Key]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "{0} types"
-msgstr ""
+msgstr "{0} 类型"
 
 #. <span class="hint dashed">@T["Select all extensions with the '{0}' type.", group.Key]</span>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:63
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Select all extensions with the '{0}' type."
-msgstr ""
+msgstr "选择具有'{0}'类型的所有扩展。"
 
 #. <span class="icon"><i class="fa-solid fa-images" aria-hidden="true"></i></span><span class="title">@T["Media"]</span>
 #: OrchardCore.Media\Views\NavigationItemText-media.Id.cshtml:1
@@ -1416,25 +1416,25 @@ msgstr "上传文件的最大字节大小。"
 #: OrchardCore.Media\Views\Admin\Options.cshtml:54
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "Max upload chunk size"
-msgstr ""
+msgstr "最大上传区块大小"
 
 #. <span class="hint">@T["The maximum chunk size when uploading files in bytes. If 0 or null, no chunked upload is used."]</span>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:57
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "The maximum chunk size when uploading files in bytes. If 0 or null, no chunked upload is used."
-msgstr ""
+msgstr "上传文件字节时最大区块大小。如果为 0 或 null，则不使用区块上传。"
 
 #. <label asp-for="TemporaryFileLifetime" class="col-sm-2 col-form-label">@T["Temporary file lifetime"]</label>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:62
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "Temporary file lifetime"
-msgstr ""
+msgstr "临时文件生存期"
 
 #. <span class="hint">@T["The lifetime of temporary files created during upload."]</span>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:65
 msgctxt "OrchardCore.Media.Views.Admin.Options"
 msgid "The lifetime of temporary files created during upload."
-msgstr ""
+msgstr "上传过程中创建的临时文件的生存期。"
 
 #. <label asp-for="CdnBaseUrl" class="col-sm-2 col-form-label">@T["Cdn base url"]</label>
 #: OrchardCore.Media\Views\Admin\Options.cshtml:70
diff --git a/Localization/zh-Hans/OrchardCore.Menu.po b/Localization/zh-Hans/OrchardCore.Menu.po
index 1695c748f062c..fedbd151e44b9 100644
--- a/Localization/zh-Hans/OrchardCore.Menu.po
+++ b/Localization/zh-Hans/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-03-31 04:54\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "菜单"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr "菜单项删除成功。"
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr "发布此内容项可能会擦除已创建的内容。事先修复任何内容类型的问题。"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "编辑 {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr "网址"
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr "查看文档"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/zh-Hans/OrchardCore.Microsoft.Authentication.po b/Localization/zh-Hans/OrchardCore.Microsoft.Authentication.po
index 8b00abe4f4c63..c196992477073 100644
--- a/Localization/zh-Hans/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/zh-Hans/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr "Microsoft 帐户认证设置"
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr "Microsoft 开发者门户参数中找到了应用程序ID。"
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr "Microsoft 开发者门户参数中找到了应用程序密密钥。"
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/zh-Hans/OrchardCore.Navigation.po b/Localization/zh-Hans/OrchardCore.Navigation.po
index d260e8fcb6719..09836eaaa8774 100644
--- a/Localization/zh-Hans/OrchardCore.Navigation.po
+++ b/Localization/zh-Hans/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/zh-Hans/OrchardCore.Notifications.po b/Localization/zh-Hans/OrchardCore.Notifications.po
index 371d7694b0acf..2c63c78e5f2c1 100644
--- a/Localization/zh-Hans/OrchardCore.Notifications.po
+++ b/Localization/zh-Hans/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr "通知内容所有者任务"
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr "通知用户任务"
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr "通知"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr "完成"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr "失败"
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr "失败：找不到用户"
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr "已读"
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr "未读"
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr "最近创建的"
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr "上次创建"
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr "标记为未读"
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr "删除"
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] "通知"
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr "{0} {1} 未读成功。"
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr "{0} {1} 读取成功。"
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr "{0} {1} 删除成功。"
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr "标记为已读"
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr "未找到通知。"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr "已选择"
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr "选择所有"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] "{0} 项"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr "项目 {0} 到 {1}"
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr "删除"
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
-msgstr "通知用户"
+msgid "Notify Content Owner"
+msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "您可以使用 Liquid 语法。"
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "此可选文本内容不支持 HTML。您可以使用 Liquid 语法。"
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,11 +375,11 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "如果选中，通知服务将使用 HTML 内容，如果它支持 HTML。"
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
-msgstr "通知所有者"
+msgid "Notify Content Owner"
+msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:2
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr "通知用户"
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr "您可以使用 Liquid 语法。"
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr "此可选文本内容不支持 HTML。您可以使用 Liquid 语法。"
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr "如果选中，通知服务将使用 HTML 实体，如果它支持 HTML。"
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] "通知"
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
-msgstr "您有超过 {0} 个未读 {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr "您有 {0} 未读 {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
-msgstr "您没有未读通知"
+msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
-msgstr "通知中心"
+msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/zh-Hans/OrchardCore.OpenId.po b/Localization/zh-Hans/OrchardCore.OpenId.po
index 9aae050a2a4e5..f5f49d6f1f7eb 100644
--- a/Localization/zh-Hans/OrchardCore.OpenId.po
+++ b/Localization/zh-Hans/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:09\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr "该名称已被另一个作用域占用。"
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr "OpenID 服务器配置更新成功。"
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr "OpenID 验证配置更新成功。"
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr "创建新应用程序"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr "客户端 Id"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr "显示名称"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "机密应用程序必须在与令牌和吊销终结点通信时发送其客户端机密。这保证只有合法的客户端才能交换授权代码或获取刷新令牌。"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr "允许刷新令牌流"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr "允许注销终结点"
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr "确保客户端应用程序和 OAuth 或 OIDC 库在启用此选项之前支持PKCE"
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr "创建新范围"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr "显示名称"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "注意：服务器租户总是包含在访问令牌受众中，即使没有请求范围。"
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr "编辑应用程序"
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr "客户 Id"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr "显示名称"
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr "机密应用程序必须在与令牌和吊销终结点通信时发送其客户端机密。这保证只有合法的客户端才能交换授权代码或获取刷新令牌。"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr "客户端机密"
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr "允许刷新令牌流"
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr "在启用此选项前，确保客户端/客户端库支持PKCE。"
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr "编辑作用域"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr "显示名称"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr "注意：服务器租户总是包含在访问令牌受众中，即使没有请求范围。"
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "保存设置后, 将重新加载当前租户。"
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr "显示名称"
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr "在请求 OpenIdConnect 时使用的权限"
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr "\"client_id\""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr "应用程序的基路径内将返回用户代理的请求路径。中间件到达时将处理此请求。"
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr "见 post_logout_redirect_uri 从 "
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr "在应用程序从标识提供程序注销后, 用户代理将被重定向到的 uri。重定向将在调用 SignedOutCallbackPath 后发生。"
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr "代码身份验证流"
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr "看到： "
@@ -1217,15 +1217,15 @@ msgstr "使用 \"代码\" 响应类型"
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr "示例："
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr "使用 \"代码标记\" 响应类型"
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr "隐式身份验证流"
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr "使用 \"id_token\" 响应类型"
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr "使用 \"id_token 令牌\" 响应类型"
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr "响应模式"
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr "配置响应模式请参见: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr "客户端机密"
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr "设置客户端机密。"
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr "参数名称"
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr "值"
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr "从列表中删除参数"
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr "添加参数"
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr "编辑数据"
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr "参数"
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr "允许值的 JSON 表示，例如 {0}"
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr "确定"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr "高级参数"
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr "可与授权请求一起发送的高级参数。"
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr "这些选项都是可选的，只用于高级用户。"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr "标识服务器 (此站点) 的基本 URL。如果没有提供, 则会自动计算基于站点主机的默认值。"
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr "选择加密证书位置。"
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr "选择加密证书商店。"
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr "您需要向服务器添加证书以设置 OpenID 连接模块。"
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr "选择签名证书位置。"
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr "选择签名证书商店。"
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr "当启用此选项时，刷新令牌不会被标记为已赎回，并且可以重新使用，直到其过期。"
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "保存设置后, 将重新加载当前租户。"
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr "授权服务器租户"
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr "远程 OpenID 连接服务器的地址。强烈建议使用 HTTPS 地址。"
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr "OpenID Connect Metadata Address 端点的完善格式的 URI。 这只适用于从标准权威端点无法获取元数据的高级情景。 使用租户和使用 HTTPS 地址时不能使用它。"
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/zh-Hans/OrchardCore.Placements.po b/Localization/zh-Hans/OrchardCore.Placements.po
index 31af10f6d8795..073d4ea9f9b23 100644
--- a/Localization/zh-Hans/OrchardCore.Placements.po
+++ b/Localization/zh-Hans/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr "{0} 的布置规则已经存在。请编辑现有的规则。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr "\"{0}\"的位置已被保存。"
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr "\"{0}\"的位置是空的。"
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr "\"{0}\"的位置已被删除。"
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr "解析位置时发生错误<br/>{0}"
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr "保存位置时出错。"
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr "位置已成功删除。"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr "编辑位置"
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr "形状的类型。"
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/zh-Hans/OrchardCore.ProjectTemplates.po b/Localization/zh-Hans/OrchardCore.ProjectTemplates.po
index b569520549d8a..247fd7b575e35 100644
--- a/Localization/zh-Hans/OrchardCore.ProjectTemplates.po
+++ b/Localization/zh-Hans/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr "显示"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/zh-Hans/OrchardCore.PublishLater.po b/Localization/zh-Hans/OrchardCore.PublishLater.po
index f0b1d9ab21226..cedbd32880ef0 100644
--- a/Localization/zh-Hans/OrchardCore.PublishLater.po
+++ b/Localization/zh-Hans/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr "稍后发布"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr "取消以后发布"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/zh-Hans/OrchardCore.Queries.po b/Localization/zh-Hans/OrchardCore.Queries.po
index 1b33bd8bb221e..af7243c770acc 100644
--- a/Localization/zh-Hans/OrchardCore.Queries.po
+++ b/Localization/zh-Hans/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr "运行 SQL 查询"
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr "执行 SQL 查询时发生错误: {0}"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr "SQL 查询"
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr "SQL查询使用标准SQL92语法，并根据实际数据库进行转换。表格将自动添加前缀。"
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr "查询"
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr "查询的技术名称。"
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr "如果选中，您必须手动声明内容项引用变量，如内容选择器字段， 分类字段、 Tags 字段和列表项 ID，并在配方需要时替换它们。 任何对这些内容项的引用都将丢失。"
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr "注意：查询必须配置为返回文档。"
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr "选中后，结果必须是文档ID列表。"
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/zh-Hans/OrchardCore.ReCaptcha.Core.po b/Localization/zh-Hans/OrchardCore.ReCaptcha.Core.po
index 4358f6c7054b1..89bb65bf633de 100644
--- a/Localization/zh-Hans/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/zh-Hans/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-01-12 21:20\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr "验证验证验证验证码失败"
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr "验证验证验证验证码失败"
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
-msgstr "未找到名字为 {0} 的语言"
+msgid "Failed to validate ReCaptcha"
+msgstr ""
 
diff --git a/Localization/zh-Hans/OrchardCore.ReCaptcha.po b/Localization/zh-Hans/OrchardCore.ReCaptcha.po
index 2a52368645e4d..16e59ca174f67 100644
--- a/Localization/zh-Hans/OrchardCore.ReCaptcha.po
+++ b/Localization/zh-Hans/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr "导出验证码设置。"
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr "验证码任务"
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr "验证"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr "无效"
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr "验证码验证失败。请重试。"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "当设置保存时，将重新加载当前租户。"
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr "您的Google验证码网站密钥。"
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/zh-Hans/OrchardCore.Recipes.Core.po b/Localization/zh-Hans/OrchardCore.Recipes.Core.po
index eea780ebaab27..54d8610a4abbf 100644
--- a/Localization/zh-Hans/OrchardCore.Recipes.Core.po
+++ b/Localization/zh-Hans/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-04-06 02:40\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/zh-Hans/OrchardCore.Roles.po b/Localization/zh-Hans/OrchardCore.Roles.po
index f47debaad62de..01ca3d9af5fd1 100644
--- a/Localization/zh-Hans/OrchardCore.Roles.po
+++ b/Localization/zh-Hans/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "角色"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr "无效的角色名称。"
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "已成功创建角色."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "无法删除系统角色。"
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "创建角色"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "角色名称"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr "编辑角色细节"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "许可"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr "此权限允许用户提升其他权限。请认真考虑。"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "取消"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr "角色"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/zh-Hans/OrchardCore.Rules.po b/Localization/zh-Hans/OrchardCore.Rules.po
index c68ac32425e63..2a8e78687661d 100644
--- a/Localization/zh-Hans/OrchardCore.Rules.po
+++ b/Localization/zh-Hans/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr "全部"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr "任何"
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr "添加"
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr "内容类型"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr "选择规则操作符。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr "区域文化"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "选择条件操作符。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -396,9 +396,9 @@ msgstr "不管当前用户是否已验证。"
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
-msgstr ""
+msgstr "Javascript"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr "角色"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "选择条件操作符。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr "网址"
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr "选择条件操作符。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/zh-Hans/OrchardCore.Search.Elasticsearch.po b/Localization/zh-Hans/OrchardCore.Search.Elasticsearch.po
index 82f5823ee9b40..6764451ae0750 100644
--- a/Localization/zh-Hans/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/zh-Hans/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/zh-Hans/OrchardCore.Search.Lucene.po b/Localization/zh-Hans/OrchardCore.Search.Lucene.po
index 0a9ed91a7ae26..c2f571bfec6d8 100644
--- a/Localization/zh-Hans/OrchardCore.Search.Lucene.po
+++ b/Localization/zh-Hans/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/zh-Hans/OrchardCore.Search.po b/Localization/zh-Hans/OrchardCore.Search.po
index 11a3511f5d01a..79a854a622dda 100644
--- a/Localization/zh-Hans/OrchardCore.Search.po
+++ b/Localization/zh-Hans/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -55,33 +55,33 @@ msgstr "未找到结果。"
 #: OrchardCore.Search\Views\SearchFormPart.cshtml:9
 msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
-msgstr ""
+msgstr "占位符"
 
 #. <span class="hint">@T["The placeholder text to use in the search bar."]</span>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:9
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
-msgstr ""
+msgstr "在搜索栏中使用的占位符文本。"
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
-msgstr ""
+msgstr "索引名称"
 
 #. <span class="hint">@T["Leave it empty to use the default index."]</span>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:17
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
-msgstr ""
+msgstr "留空则使用默认索引。"
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr "用于搜索页的默认索引。"
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/zh-Hans/OrchardCore.Security.po b/Localization/zh-Hans/OrchardCore.Security.po
index d466066c699d1..11bb1df26e44c 100644
--- a/Localization/zh-Hans/OrchardCore.Security.po
+++ b/Localization/zh-Hans/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-04-06 01:16\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr "当前设置来自配置源，保存设置将影响管理设置而不是配置。"
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr "允许管理员控制用户代理被允许加载给定页面的资源。"
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr "允许网站控制哪些功能和 API 可以在浏览器中使用。"
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/zh-Hans/OrchardCore.Seo.po b/Localization/zh-Hans/OrchardCore.Seo.po
index 97c870ed0b821..ac4ce952ddb5c 100644
--- a/Localization/zh-Hans/OrchardCore.Seo.po
+++ b/Localization/zh-Hans/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr "是否渲染此页面的元数据。"
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr "编辑数据"
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/zh-Hans/OrchardCore.Settings.po b/Localization/zh-Hans/OrchardCore.Settings.po
index b6473cfa1b486..7510780c31d01 100644
--- a/Localization/zh-Hans/OrchardCore.Settings.po
+++ b/Localization/zh-Hans/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "设置更新成功"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr "页面大小必须大于零。"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr "页面大小必须小于或等于 {0}。"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr "基础网址必须是完全合格的 URL。"
@@ -82,187 +82,187 @@ msgstr "删除"
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:3
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
-msgstr ""
+msgstr "动态缓存设置"
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
-msgstr ""
+msgstr "缓存模式"
 
 #. <option value="@CacheMode.FromConfiguration.ToString()">@T["From environment — enabled in <em>Production</em>, disabled otherwise"]</option>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:9
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "From environment — enabled in <em>Production</em>, disabled otherwise"
-msgstr ""
+msgstr "从环境 — 启用 <em>生产</em>，禁用其它功能"
 
 #. <option value="@CacheMode.Enabled.ToString()">@T["Enabled"]</option>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:10
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Enabled"
-msgstr ""
+msgstr "启用"
 
 #. <option value="@CacheMode.DebugEnabled.ToString()">@T["Enabled with cache debug mode"]</option>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:11
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Enabled with cache debug mode"
-msgstr ""
+msgstr "启用缓存调试模式"
 
 #. <option value="@CacheMode.Disabled.ToString()">@T["Disabled"]</option>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:12
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Disabled"
-msgstr ""
+msgstr "禁用"
 
 #. <span class="hint">@T["Determines whether caches are enabled or disabled."]</span>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Determines whether caches are enabled or disabled."
-msgstr ""
+msgstr "确定是否启用或禁用缓存。"
 
 #. @T["The current tenant will be reloaded when the settings are saved."]
 #: OrchardCore.Settings\Views\Settings-General.Wrapper.cshtml:4
 msgctxt "OrchardCore.Settings.Views.Settings-General.Wrapper"
 msgid "The current tenant will be reloaded when the settings are saved."
-msgstr ""
+msgstr "保存设置时将重新加载当前租户。"
 
 #. <h5>@T["Settings for scripts and stylesheets"]</h5>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:3
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Settings for scripts and stylesheets"
-msgstr ""
+msgstr "脚本和样式表设置"
 
 #. <label class="form-check-label" asp-for="@Model.AppendVersion">@T["Use resources cache busting"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:8
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Use resources cache busting"
-msgstr ""
+msgstr "使用资源缓存破坏"
 
 #. <span class="hint dashed">@T["Whether cache busting (append a version) is used for scripts and stylesheets"]</span>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:9
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether cache busting (append a version) is used for scripts and stylesheets"
-msgstr ""
+msgstr "缓存破坏是否用于脚本和样式表 (附加版本)"
 
 #. <label class="form-check-label" asp-for="@Model.UseCdn">@T["Use framework CDN (Content Delivery Network)"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:16
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Use framework CDN (Content Delivery Network)"
-msgstr ""
+msgstr "使用 CDN (内容传送网络)"
 
 #. <span class="hint dashed">@T["Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"]</span>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:17
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
-msgstr ""
+msgstr "是否使用 CDN 用于注册脚本和样式表，例如 jQuery 或其本地版本"
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
-msgstr ""
+msgstr "网站 CDN (内容传送网络) 基础网址"
 
 #. <span class="hint">@T["A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"]</span>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:25
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
-msgstr ""
+msgstr "一个基的 CDN URL 已前缀到当地脚本和样式表。如果该值为空或者启用资源调试模式，该链接被禁用。例如， <em>https://cdn.myste.com</em>"
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
-msgstr ""
+msgstr "资源调试模式"
 
 #. <option value="@ResourceDebugMode.FromConfiguration.ToString()">@T["From environment — disabled in <em>Production</em>, enabled otherwise"]</option>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:32
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "From environment — disabled in <em>Production</em>, enabled otherwise"
-msgstr ""
+msgstr "根据环境 — 在 <em>生产环境</em>中禁用，否则启用"
 
 #. <option value="@ResourceDebugMode.Enabled.ToString()">@T["Enabled — use debuggable version of resources"]</option>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:33
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Enabled — use debuggable version of resources"
-msgstr ""
+msgstr "启用 — 使用调试版本的资源"
 
 #. <option value="@ResourceDebugMode.Disabled.ToString()">@T["Disabled — use minified version of resources"]</option>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:34
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Disabled — use minified version of resources"
-msgstr ""
+msgstr "禁用 — 使用简洁的资源"
 
 #. <span class="hint">@T["Determines whether scripts and stylesheets load in their debuggable or minified form."]</span>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:36
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
-msgstr ""
+msgstr "确定脚本和样式表是否在其调试或微型表单中加载。"
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
-msgstr ""
+msgstr "站点名称"
 
 #. <span class="hint">@T["The site name."]</span>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:10
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
-msgstr ""
+msgstr "站点名称。"
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
-msgstr ""
+msgstr "页面标题格式"
 
 #. <span class="hint">@T["The default format of page titles."]</span>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:17
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
-msgstr ""
+msgstr "页面标题的默认格式。"
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
-msgstr ""
+msgstr "基本网址"
 
 #. <span class="hint">@T["Enter the fully qualified base URL of the web site."]</span>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:24
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
-msgstr ""
+msgstr "输入网站的完全合格的基本URL。"
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
-msgstr ""
+msgstr "默认时区"
 
 #. <option value="">@T["Local to server"]</option>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:31
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Local to server"
-msgstr ""
+msgstr "本地服务器"
 
 #. <span class="hint">@T["Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."]</span>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:40
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
-msgstr ""
+msgstr "确定显示和编辑日期和时间时使用的默认时区。 如果有的话，每个时区都会自动应用DST(夏令时间)。"
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
-msgstr ""
+msgstr "页面大小"
 
 #. <span class="hint">@T["The default page size."]</span>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:49
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default page size."
-msgstr ""
+msgstr "默认页面大小。"
 
 #. <button class="primaryAction btn btn-primary save" type="submit">@T["Save"]</button>
 #: OrchardCore.Settings\Views\SiteSettings.SaveButton.cshtml:1
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "网站设置"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/zh-Hans/OrchardCore.Setup.Core.po b/Localization/zh-Hans/OrchardCore.Setup.Core.po
index 13971d1214fec..e3be5ba6af397 100644
--- a/Localization/zh-Hans/OrchardCore.Setup.Core.po
+++ b/Localization/zh-Hans/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr "数据库提供商设置是必需的。"
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr "不支持所提供的数据库提供商。"
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "提供的连接字符串无效或服务器不可访问。"
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "已在使用所提供的数据库、表前缀和架构。"
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/zh-Hans/OrchardCore.Setup.po b/Localization/zh-Hans/OrchardCore.Setup.po
index f17933ad9bd6e..64c8bb3bad69c 100644
--- a/Localization/zh-Hans/OrchardCore.Setup.po
+++ b/Localization/zh-Hans/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "密码至少含有{0}"
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "在没有配方的情况下无法安装站点。"
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "这将作为您站点页面的默认标题。"
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "配方预定义了常用的功能和设置组合。"
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "显示、编辑日期和时间时使用的默认时区。"
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr "该数据库用于存储站点的配置及其内容。"
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr "如果您打算对多个站点使用同一个数据库，您可以指定一个表前缀用来区分。"
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "显示/隐藏连接字符串"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "超级用户拥有站点所有的权限，它应该只在安装和灾难恢复时使用。"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "用户名"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "电子邮箱无效。"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "密码强度"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/zh-Hans/OrchardCore.Shortcodes.po b/Localization/zh-Hans/OrchardCore.Shortcodes.po
index cfe12a4b7729d..77fcd87f7c358 100644
--- a/Localization/zh-Hans/OrchardCore.Shortcodes.po
+++ b/Localization/zh-Hans/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr "模板内容是强制性的。"
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "模板不包含有效的 Liquid 表达式。详细信息： {0}"
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr "短代码模板删除成功。"
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr "短代码模板已成功删除。"
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr "创建短代码"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr "短代码的名称。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr "短代码提示。"
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr "短代码的示例用法。"
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr "此短代码的类别。"
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "选择时短代码的默认值。默认值为 [name]。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr "编辑短代码"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr "短代码的名称。"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr "短代码提示。"
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr "短代码的示例用法。"
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr "此短代码的类别。"
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr "选择时短代码的默认值。默认值为 [name]。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/zh-Hans/OrchardCore.Sitemaps.po b/Localization/zh-Hans/OrchardCore.Sitemaps.po
index 743a2dfd8109f..9b1ccd8703c9e 100644
--- a/Localization/zh-Hans/OrchardCore.Sitemaps.po
+++ b/Localization/zh-Hans/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "站点设置“基础url”属性为空，但是生成站点需要填写。"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "站点设置“基础url”属性为空，但是生成站点需要填写。"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "取消选中以禁用站点地图索引路由。"
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr "网站地图自定义路径"
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr "要添加到站点的路径。例如路径/to/sites"
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr "此路径可能改变的默认频率。"
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "站点设置“基础url”属性为空，但是生成站点需要填写。"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr "站点设置“基础url”属性为空，但是生成站点需要填写。"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr "名称"
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr "取消选中以禁用站点地图索引路由。"
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -770,7 +770,7 @@ msgstr "您确定要 {0} 这些项目吗？"
 #: OrchardCore.Sitemaps\Views\Admin\List.cshtml:73
 msgctxt "OrchardCore.Sitemaps.Views.Admin.List"
 msgid "Manage Sources"
-msgstr ""
+msgstr "管理来源"
 
 #. <a asp-action="Index" asp-controller="Sitemap" asp-area="OrchardCore.Sitemaps" asp-route-sitemapId="@entry.SitemapId" target="_blank" class="btn btn-success btn-sm">@T["View"]</a>
 #: OrchardCore.Sitemaps\Views\Admin\List.cshtml:76
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr "选中此项可从站点地图中排除此内容项。"
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr "此内容项可能改变的频率。"
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
@@ -1128,11 +1128,11 @@ msgstr "添加"
 #: OrchardCore.Sitemaps\Views\SitemapsRobotsSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Sitemaps.Views.SitemapsRobotsSettings.Edit"
 msgid "Include all sitemaps."
-msgstr ""
+msgstr "包括所有站点地图。"
 
 #. <span class="hint dashed">@T["Check to let the system include all sitemaps."]</span>
 #: OrchardCore.Sitemaps\Views\SitemapsRobotsSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Sitemaps.Views.SitemapsRobotsSettings.Edit"
 msgid "Check to let the system include all sitemaps."
-msgstr ""
+msgstr "选中可让系统包含所有站点地图。"
 
diff --git a/Localization/zh-Hans/OrchardCore.Sms.Core.po b/Localization/zh-Hans/OrchardCore.Sms.Core.po
index 782af9f9bf7ea..c82bb5e372a96 100644
--- a/Localization/zh-Hans/OrchardCore.Sms.Core.po
+++ b/Localization/zh-Hans/OrchardCore.Sms.Core.po
@@ -10,47 +10,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-24 15:55\n"
+"PO-Revision-Date: 2023-09-09 10:28\n"
 
 #. public LocalizedString Name => S["Default"];
 #: OrchardCore.Sms.Core\Services\DefaultSmsProvider.cs:15
 msgctxt "OrchardCore.Sms.Services.DefaultSmsProvider"
 msgid "Default"
-msgstr ""
+msgstr "默认​​​​​"
 
 #. return Task.FromResult(SmsResult.Failed(S["SMS settings must be configured before an SMS message can be sent."]));
 #: OrchardCore.Sms.Core\Services\DefaultSmsProvider.cs:19
 msgctxt "OrchardCore.Sms.Services.DefaultSmsProvider"
 msgid "SMS settings must be configured before an SMS message can be sent."
-msgstr ""
+msgstr "短信设置必须先配置，然后才能发送短信。"
 
 #. public LocalizedString Name => S["Log - writes messages to the logs"];
 #: OrchardCore.Sms.Core\Services\LogSmsProvider.cs:14
 msgctxt "OrchardCore.Sms.Services.LogSmsProvider"
 msgid "Log - writes messages to the logs"
-msgstr ""
+msgstr "日志 - 将消息写入日志"
 
 #. public LocalizedString Name => S["SMS Notifications"];
 #: OrchardCore.Sms.Core\Services\SmsNotificationProvider.cs:24
 msgctxt "OrchardCore.Sms.Services.SmsNotificationProvider"
 msgid "SMS Notifications"
-msgstr ""
+msgstr "短信通知"
 
 #. public LocalizedString Name => S["Twilio"];
 #: OrchardCore.Sms.Core\Services\TwilioSmsProvider.cs:29
 msgctxt "OrchardCore.Sms.Services.TwilioSmsProvider"
 msgid "Twilio"
-msgstr ""
+msgstr "Twilio"
 
 #. return SmsResult.Failed(S["SMS message was not send."]);
 #: OrchardCore.Sms.Core\Services\TwilioSmsProvider.cs:94
 msgctxt "OrchardCore.Sms.Services.TwilioSmsProvider"
 msgid "SMS message was not send."
-msgstr ""
+msgstr "短信未发送。"
 
 #. return SmsResult.Failed(S["SMS message was not send. Error: {0}", ex.Message]);
 #: OrchardCore.Sms.Core\Services\TwilioSmsProvider.cs:100
 msgctxt "OrchardCore.Sms.Services.TwilioSmsProvider"
 msgid "SMS message was not send. Error: {0}"
-msgstr ""
+msgstr "短信未发送。错误： {0}"
 
diff --git a/Localization/zh-Hans/OrchardCore.Sms.po b/Localization/zh-Hans/OrchardCore.Sms.po
index a30bb3e2b141d..8b32a9c2f2930 100644
--- a/Localization/zh-Hans/OrchardCore.Sms.po
+++ b/Localization/zh-Hans/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/zh-Hans/OrchardCore.Spatial.po b/Localization/zh-Hans/OrchardCore.Spatial.po
index f56ad7b273255..902dcb32968b5 100644
--- a/Localization/zh-Hans/OrchardCore.Spatial.po
+++ b/Localization/zh-Hans/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-04-24 03:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr "{0} 字段是必需的。"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr "纬度"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr "传单编辑器"
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr "纬度"
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr "值是必需的"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/zh-Hans/OrchardCore.Taxonomies.po b/Localization/zh-Hans/OrchardCore.Taxonomies.po
index e537338e00c8b..3c6c7b67deacc 100644
--- a/Localization/zh-Hans/OrchardCore.Taxonomies.po
+++ b/Localization/zh-Hans/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr "“{0}”需要一个值。"
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr "分类筛选"
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr "标签"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "找不到分类。请检查此字段的设置。"
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr "创建标签时出错"
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr "输入搜索内容"
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr "选择"
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr "移除"
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr "按回车键创建标签"
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr "没有找到标签"
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr "标签"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "找不到分类。请检查此字段的设置。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器中显示此字段的提示文字。"
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "分类"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "必填"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr "是否至少选择一个元素。"
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "唯一"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr "是否只能选择一个元素。"
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "仅限叶子"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr "是否只留下可选项目。"
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr "是否可以在线创建新标签。注意：当在线创建标签时，只会设置显示字词属性。"
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "分类内容类型"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "添加 {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "您已对分类进行了重新排序。"
diff --git a/Localization/zh-Hans/OrchardCore.Templates.Cms.Module.po b/Localization/zh-Hans/OrchardCore.Templates.Cms.Module.po
index fa48fa15a4ea3..365e30711c54b 100644
--- a/Localization/zh-Hans/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/zh-Hans/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:34\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "显示"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/zh-Hans/OrchardCore.Templates.po b/Localization/zh-Hans/OrchardCore.Templates.po
index ea31565c79129..c29a496b6b0da 100644
--- a/Localization/zh-Hans/OrchardCore.Templates.po
+++ b/Localization/zh-Hans/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr "{0} 模板已创建。"
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr "模板删除成功。"
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr "模板已成功删除。"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr "所有模板"
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "预览"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "模板的名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "模板的说明。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "预览"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "模板的名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "模板描述。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/zh-Hans/OrchardCore.Tenants.po b/Localization/zh-Hans/OrchardCore.Tenants.po
index f8000e04d2faf..ecca606f7b76f 100644
--- a/Localization/zh-Hans/OrchardCore.Tenants.po
+++ b/Localization/zh-Hans/OrchardCore.Tenants.po
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
 msgctxt "OrchardCore.Tenants.AdminMenu"
 msgid "Multi-Tenancy"
-msgstr ""
+msgstr "多租户"
 
 #. .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
 #. .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "租户"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr "全部"
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr "所有状态"
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr "运行中"
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr "已禁用"
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr "未初始化"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr "名称"
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr "状态"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr "禁用"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr "启用"
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "您不能禁用默认租户。"
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "租户“{0}”已被禁用。"
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "租户“{0}”已经启用。"
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr "您只能禁用正在运行的租户。"
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "您只能启用已禁用租户。"
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr "您只能移除“禁用”或“未初始化”租户。"
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr "移除租户{0} 时发生错误。 {1}"
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr "租户'{0}'已被删除，查看日志文件以获取更多信息。"
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr "您只能禁用正在运行的租户。"
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr "您只能启用禁用的租户。"
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr "您只能移除“禁用”或“未初始化”租户。"
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr "删除租户{0} 时出错。"
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr "用户名 '{0}'无效，只能包含字母或数字。"
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr "电子邮件无效。"
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "未找到租户：“{0}”"
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "无法设置租户。"
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "未指定数据库类型。"
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr "该数据库提供程序不受支持。"
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "此数据库类型需要设置对应的连接字符串。"
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "“配方”或“配方名称”是必需的。"
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "找不到配方“{0}”。"
@@ -242,7 +242,7 @@ msgstr "提供的 json 无效。"
 #: OrchardCore.Tenants\FeatureProfilesAdminMenu.cs:34
 msgctxt "OrchardCore.Tenants.FeatureProfilesAdminMenu"
 msgid "Multi-Tenancy"
-msgstr ""
+msgstr "多租户"
 
 #. .Add(S["Feature Profiles"], S["Feature Profiles"].PrefixPosition(), featureProfiles => featureProfiles
 #. .Add(S["Feature Profiles"], S["Feature Profiles"].PrefixPosition(), featureProfiles => featureProfiles
@@ -250,82 +250,76 @@ msgstr ""
 #: OrchardCore.Tenants\FeatureProfilesAdminMenu.cs:36
 msgctxt "OrchardCore.Tenants.FeatureProfilesAdminMenu"
 msgid "Feature Profiles"
-msgstr ""
+msgstr "功能配置文件"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr "租户名称是必需的。"
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr "功能配置文件不存在。"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr "租户名称无效。只能包含字符，无空格。"
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr "主机和网址前缀不能同时为空。"
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr "Url前缀不能包含多个部分。"
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr "具有相同主机和前缀的租户已存在。"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr "该租户名称与“Default”租户冲突。"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr "租户名称已存在。"
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr "找不到要验证的现有租户。"
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr "不支持所提供的数据库提供商。"
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr "提供的连接字符串无效或服务器不可访问。"
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr "相关的数据库文件已在使用中。"
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr "已在使用所提供的数据库、表前缀和架构。"
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr "可选地指定哪些预设应用于安装体验。"
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr "连接字符串到数据库实例，例如 {0}。"
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr "表前缀"
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr "连接字符串"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr "可选地指定哪个功能应该应用于这个租户。"
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr "租户类别。"
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr "(可选) 示例：如果前缀是\"site1\"，租户网址前缀是\"https://orchardcore.net/site1\"。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr "租户的说明。"
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "创建租户"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr "创建租户"
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr "选择要创建的租户名称。"
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr "可选，要创建的租户的说明。"
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr "(可选) 示例：如果前缀是\"site1\"，租户网址前缀是\"http://orchardproject.net/site1\"。"
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr "例如：如果主机是“orchardproject.net”，租户网站URL是“http://orchardproject.net/”。支持Liquid。"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "要使用哪种类型的数据库？"
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "数据表前缀"
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "连接字符串"
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "例如，SQL Server的 '{0}' 。"
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr "配方"
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr "禁用租户"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "编辑租户"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr "启用租户"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr "启用租户。"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr "功能配置文件的名称。"
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr "无效"
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "设计"
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr "创建租户任务"
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr "选择要设置的租户名称。"
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr "站点名称"
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr "管理员用户名"
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr "管理员电子邮件"
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr "管理员密码"
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr "要使用哪种类型的数据库？"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr "数据表前缀"
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr "连接字符串"
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr "例如，SQL Server的 '{0}' 。"
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/zh-Hans/OrchardCore.Tests.po b/Localization/zh-Hans/OrchardCore.Tests.po
index 9a1f6c558d358..14fb781305b53 100644
--- a/Localization/zh-Hans/OrchardCore.Tests.po
+++ b/Localization/zh-Hans/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/zh-Hans/OrchardCore.Themes.po b/Localization/zh-Hans/OrchardCore.Themes.po
index 5bd7694374abd..f99e380089e32 100644
--- a/Localization/zh-Hans/OrchardCore.Themes.po
+++ b/Localization/zh-Hans/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "导出当前选定的站点主题和管理主题。"
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/zh-Hans/OrchardCore.Title.po b/Localization/zh-Hans/OrchardCore.Title.po
index b037b1c34a971..af4b9b00a0b79 100644
--- a/Localization/zh-Hans/OrchardCore.Title.po
+++ b/Localization/zh-Hans/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr "标题需要一个值。"
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr "标题需要一个值。"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr "模式不包含有效的 Liquid 表达式。详细信息： {0}"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr "标题将使用规则自动生成。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr "选中可呈现显示视图中的标题。"
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hans/OrchardCore.Twitter.po b/Localization/zh-Hans/OrchardCore.Twitter.po
index 386a79fd72062..8b165a492d8d8 100644
--- a/Localization/zh-Hans/OrchardCore.Twitter.po
+++ b/Localization/zh-Hans/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr "必须输入访问令牌密钥"
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr "更新 Twitter 状态任务"
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr "社交"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr "失败"
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr "推特"
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr "保存设置后, 将重新加载当前租户。"
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr "查看文档"
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr "解密设置时出错。请应用并保存。"
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr "Twitter 集成设置"
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr "API密钥"
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "在 Twitter 应用仪表板的 \"密钥和令牌\" 选项卡中定义的 API secret key。"
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr "API 密钥"
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "在 Twitter 应用仪表板的 \"密钥和令牌\" 选项卡中定义的 API secret key。"
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr "访问令牌"
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr "在 Twitter 应用仪表板的 \"密钥和令牌\" 选项卡中定义的访问令牌。"
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr "访问令牌密钥"
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr "在 Twitter 应用仪表板的 \"密钥和令牌\" 选项卡中定义的访问令牌密钥。"
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "使用Twitter设置登录"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr "更新 Twitter 状态"
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/zh-Hans/OrchardCore.Users.Core.po b/Localization/zh-Hans/OrchardCore.Users.Core.po
index c44a28074bb61..12aab0155997e 100644
--- a/Localization/zh-Hans/OrchardCore.Users.Core.po
+++ b/Localization/zh-Hans/OrchardCore.Users.Core.po
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Local login is disabled."
-msgstr ""
+msgstr "本地登录已禁用。"
 
 #. reportError("UserName", S["A user name is required."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:60
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "电子邮件'{0}'无效。"
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "异常错误：`{0}`"
diff --git a/Localization/zh-Hans/OrchardCore.Users.po b/Localization/zh-Hans/OrchardCore.Users.po
index ee37f49ccbaa9..091778ca4249b 100644
--- a/Localization/zh-Hans/OrchardCore.Users.po
+++ b/Localization/zh-Hans/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "用户创建成功"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr "本地登录已禁用。"
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr "此帐户被锁定。"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "登录失败。"
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr "您的密码已成功更改。"
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr "在外部提供程序中发生错误。"
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "站点不允许用户注册。"
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr "确认您的帐户"
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr "指定的用户不允许登录。"
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr "请确认您的电子邮箱。"
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "所有用户"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr "已启用的用户"
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr "已禁用的用户"
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr "名称"
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr "电子邮箱"
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr "批准"
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr "启用"
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr "禁用"
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr "删除"
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
-msgstr "所有角色"
+msgid "Any role"
+msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr "已验证 (无角色)"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr "用户 {0} 已审核通过。"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr "用户 {0} 已删除。"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr "用户 {0} 已禁用。"
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr "用户 {0} 已启用。"
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr "用户创建成功。"
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr "用户更新成功。"
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr "用户删除成功。"
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr "无法删除用户。"
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "密码更新正确。"
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr "用户解锁成功。"
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr "无法解锁用户。"
@@ -456,19 +456,19 @@ msgstr "无法解锁用户。"
 #: OrchardCore.Users\Controllers\AuthenticatorAppController.cs:95
 msgctxt "OrchardCore.Users.Controllers.AuthenticatorAppController"
 msgid "Verification code is invalid."
-msgstr ""
+msgstr "验证码无效。"
 
 #. await Notifier.SuccessAsync(H["Your authenticator app has been verified."]);
 #: OrchardCore.Users\Controllers\AuthenticatorAppController.cs:104
 msgctxt "OrchardCore.Users.Controllers.AuthenticatorAppController"
 msgid "Your authenticator app has been verified."
-msgstr ""
+msgstr "您的身份验证程序已被验证。"
 
 #. await Notifier.SuccessAsync(H["Your authenticator app key has been reset."]);
 #: OrchardCore.Users\Controllers\AuthenticatorAppController.cs:141
 msgctxt "OrchardCore.Users.Controllers.AuthenticatorAppController"
 msgid "Your authenticator app key has been reset."
-msgstr ""
+msgstr "您的身份验证器应用密钥已被重置。"
 
 #. ModelState.AddModelError("Email", S["This email is already your current one."]);
 #: OrchardCore.Users\Controllers\ChangeEmailController.cs:67
@@ -486,37 +486,37 @@ msgstr "电子邮箱已被使用。"
 #: OrchardCore.Users\Controllers\EmailAuthenticatorController.cs:113
 msgctxt "OrchardCore.Users.Controllers.EmailAuthenticatorController"
 msgid "We are unable to send you an email at this time. Please try again later."
-msgstr ""
+msgstr "我们现在无法向您发送电子邮件。请稍后再试。"
 
 #. await Notifier.SuccessAsync(H["We have successfully sent an verification code to your email. Please retrieve the code from your email."]);
 #: OrchardCore.Users\Controllers\EmailAuthenticatorController.cs:118
 msgctxt "OrchardCore.Users.Controllers.EmailAuthenticatorController"
 msgid "We have successfully sent an verification code to your email. Please retrieve the code from your email."
-msgstr ""
+msgstr "我们已成功发送验证码到您的电子邮件。请从您的电子邮件中检索该代码。"
 
 #. await Notifier.SuccessAsync(H["Your email has been confirmed."]);
 #: OrchardCore.Users\Controllers\EmailAuthenticatorController.cs:145
 msgctxt "OrchardCore.Users.Controllers.EmailAuthenticatorController"
 msgid "Your email has been confirmed."
-msgstr ""
+msgstr "您的电子邮件已被确认。"
 
 #. await Notifier.ErrorAsync(H["Unable to confirm your email. Please try again."]);
 #: OrchardCore.Users\Controllers\EmailAuthenticatorController.cs:150
 msgctxt "OrchardCore.Users.Controllers.EmailAuthenticatorController"
 msgid "Unable to confirm your email. Please try again."
-msgstr ""
+msgstr "无法确认您的电子邮件。请重试。"
 
 #. var errorMessage = S["The email could not be sent. Please attempt to request the code at a later time."];
 #: OrchardCore.Users\Controllers\EmailAuthenticatorController.cs:159
 msgctxt "OrchardCore.Users.Controllers.EmailAuthenticatorController"
 msgid "The email could not be sent. Please attempt to request the code at a later time."
-msgstr ""
+msgstr "无法发送电子邮件。请稍后尝试请求代码。"
 
 #. message = result.Succeeded ? S["A verification code has been sent via email. Please check your email for the code."].Value
 #: OrchardCore.Users\Controllers\EmailAuthenticatorController.cs:186
 msgctxt "OrchardCore.Users.Controllers.EmailAuthenticatorController"
 msgid "A verification code has been sent via email. Please check your email for the code."
-msgstr ""
+msgstr "验证码已通过电子邮件发送。请检查您的电子邮件获取验证码。"
 
 #. ModelState.AddModelError("Email", S["Email is required."]);
 #: OrchardCore.Users\Controllers\RegistrationController.cs:75
@@ -554,19 +554,19 @@ msgstr "重置您的密码 "
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:116
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Invalid phone number used."
-msgstr ""
+msgstr "使用的电话号码无效。"
 
 #. await Notifier.ErrorAsync(H["We are unable to send you an SMS message at this time. Please try again later."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:136
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "We are unable to send you an SMS message at this time. Please try again later."
-msgstr ""
+msgstr "我们现在无法向您发送短信。请稍后再试。"
 
 #. await Notifier.SuccessAsync(H["We have successfully sent an verification code to your phone number. Please retrieve the code from your device."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:141
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "We have successfully sent an verification code to your phone number. Please retrieve the code from your device."
-msgstr ""
+msgstr "我们已成功地向您的手机号码发送了验证码。请从您的设备中检索该代码。"
 
 #. await Notifier.ErrorAsync(H["Unable to find a phone number."]);
 #. await Notifier.ErrorAsync(H["Unable to find a phone number."]);
@@ -574,31 +574,31 @@ msgstr ""
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:184
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Unable to find a phone number."
-msgstr ""
+msgstr "找不到电话号码。"
 
 #. await Notifier.SuccessAsync(H["Your phone number has been confirmed."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:196
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Your phone number has been confirmed."
-msgstr ""
+msgstr "您的电话号码已被确认。"
 
 #. await Notifier.ErrorAsync(H["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:201
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "Invalid verification code."
-msgstr ""
+msgstr "无效的验证码。"
 
 #. var errorMessage = S["The SMS message could not be sent. Please attempt to request the code at a later time."];
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:211
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "The SMS message could not be sent. Please attempt to request the code at a later time."
-msgstr ""
+msgstr "短信无法发送。请稍后尝试请求代码。"
 
 #. message = result.Succeeded ? S["A verification code has been sent to your phone number. Please check your device for the code."].Value
 #: OrchardCore.Users\Controllers\SmsAuthenticatorController.cs:236
 msgctxt "OrchardCore.Users.Controllers.SmsAuthenticatorController"
 msgid "A verification code has been sent to your phone number. Please check your device for the code."
-msgstr ""
+msgstr "验证码已经发送到您的手机号码。请检查您的设备的代码。"
 
 #. await Notifier.ErrorAsync(H["You cannot remove the only active two-factor method."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationBaseController.cs:85
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr "无法更新您自己的角色。"
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr "登录设置"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr "导出登录设置。"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr "更改电子邮件设置"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr "导出更改电子邮件设置。"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr "注册设置"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr "导出注册设置。"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr "重置密码设置"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr "导出重置密码设置。"
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr "两次输入密码不一致。"
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr "分配用户角色任务"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr "用户"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr "失败"
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr "注册用户任务"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr "用户"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "无效"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "没有可用的电子邮件服务"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr "用户更新事件"
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr "用户"
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr "验证用户任务"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr "匿名的"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr "已验证"
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr "角色"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr "{0} 需要一个值。"
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr "{0} 角色 {1}"
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr "要分配的用户，支持Liquid语法。"
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "更改密码"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "当前密码："
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "新密码"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "创建用户"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "编辑密码"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "新密码"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr "请检查您的电子邮件以重置您的密码。"
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr "更改电子邮箱"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr "您已成功通过 <strong>{0}</strong>身份验证。您已经有了此电子邮件地址。 输入您的本地账户密码，然后点击注册按钮链接账户并完成登录。"
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr "用户名"
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr "邮箱"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "登录"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr "使用另一个服务登录"
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr "使用您的 {0} 帐户登录"
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "创建新帐户。"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "用户名"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "电子邮件"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "密码"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr "您已成功验证 <strong>{0}</strong>。请填写下面的表单，然后点击注册按钮来完成注册。"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr "用户名"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr "邮箱"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr "密码"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "发送确认电子邮件"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr "信息的标题。支持Liquid语法。"
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr "首页"
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2330,49 +2402,49 @@ msgstr ""
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:6
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Configure Email Authenticator"
-msgstr ""
+msgstr "配置电子邮件验证"
 
 #. <li class="breadcrumb-item active" aria-current="page">@RenderTitleSegments(T["Validate Email Address"])</li>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:7
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Validate Email Address"
-msgstr ""
+msgstr "验证电子邮件地址"
 
 #. <input asp-for="Code" class="form-control" autocomplete="off" placeholder="@T["Please enter the code"]" />
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:15
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
-msgstr ""
+msgstr "请输入代码"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
-msgstr ""
+msgstr "验证码"
 
 #. <button type="submit" class="btn btn-lg btn-primary">@T["Verify"]</button>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:19
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verify"
-msgstr ""
+msgstr "验证"
 
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\AuthenticatorApp\Reset.cshtml:5
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Reset"
 msgid "Two-Factor Authentication"
-msgstr ""
+msgstr "双重验证"
 
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="AuthenticatorApp">@T["Configure Authenticator App"]</a></li>
 #: OrchardCore.Users\Views\AuthenticatorApp\Reset.cshtml:6
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Reset"
 msgid "Configure Authenticator App"
-msgstr ""
+msgstr "配置身份验证器应用"
 
 #. <li class="breadcrumb-item active" aria-current="page">@RenderTitleSegments(T["Reset Authenticator App"])</li>
 #: OrchardCore.Users\Views\AuthenticatorApp\Reset.cshtml:7
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Reset"
 msgid "Reset Authenticator App"
-msgstr ""
+msgstr "重置身份验证器应用"
 
 #. @T["Two-Factor authentication is required and you cannot remove the only active method. If you want to add another device, <a href=\"{0}\">click here</a> to reconfigure it.", Url.Action("Index", "AuthenticatorApp")]
 #: OrchardCore.Users\Views\AuthenticatorApp\Reset.cshtml:14
@@ -2384,7 +2456,7 @@ msgstr ""
 #: OrchardCore.Users\Views\AuthenticatorApp\Reset.cshtml:20
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Reset"
 msgid "If you reset your authenticator key your authenticator app will not work until you reconfigure it."
-msgstr ""
+msgstr "如果您重置您的身份验证器密钥，您的身份验证器应用程序将在您重新配置之前无法工作。"
 
 #. <p>@T["This process disables the two-factor authentication for your account."]</p>
 #: OrchardCore.Users\Views\AuthenticatorApp\Reset.cshtml:23
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "重置密码"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "电子邮箱"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "新密码"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2608,85 +2680,85 @@ msgstr ""
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Authenticator.Actions.cshtml:7
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Authenticator.Actions"
 msgid "Set"
-msgstr ""
+msgstr "设置"
 
 #. <a asp-action="Reset" asp-controller="AuthenticatorApp" class="btn btn-sm btn-danger">@T["Reset"]</a>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Authenticator.Actions.cshtml:8
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Authenticator.Actions"
 msgid "Reset"
-msgstr ""
+msgstr "重置"
 
 #. <a asp-action="Index" asp-controller="AuthenticatorApp" class="btn btn-sm btn-success">@T["Add"]</a>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Authenticator.Actions.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Authenticator.Actions"
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #. <h4>@T["Authenticator app"]</h4>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Authenticator.Content.cshtml:1
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Authenticator.Content"
 msgid "Authenticator app"
-msgstr ""
+msgstr "身份验证器应用"
 
 #. @T["Use an authentication app or browser extension to generate one-time codes."]
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Authenticator.Content.cshtml:3
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Authenticator.Content"
 msgid "Use an authentication app or browser extension to generate one-time codes."
-msgstr ""
+msgstr "使用身份验证应用或浏览器扩展生成一次性代码。"
 
 #. <a asp-action="Index" asp-controller="EmailAuthenticator" class="btn btn-sm btn-primary me-1">@T["Verify Email"]</a>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Email.Actions.cshtml:7
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Email.Actions"
 msgid "Verify Email"
-msgstr ""
+msgstr "验证电子邮件"
 
 #. <div class="btn btn-sm btn-success disabled">@T["Verified"]</div>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Email.Actions.cshtml:11
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Email.Actions"
 msgid "Verified"
-msgstr ""
+msgstr "已验证"
 
 #. <h4>@T["Email authentication"]</h4>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Email.Content.cshtml:1
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Email.Content"
 msgid "Email authentication"
-msgstr ""
+msgstr "电子邮件认证"
 
 #. @T["Use your email to receive one-time codes."]
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Email.Content.cshtml:3
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Email.Content"
 msgid "Use your email to receive one-time codes."
-msgstr ""
+msgstr "使用您的电子邮件接收一次性代码。"
 
 #. <a asp-action="Index" asp-controller="SmsAuthenticator" class="btn btn-sm btn-primary me-1">@T["Verify Phone Number"]</a>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Actions.cshtml:8
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Actions"
 msgid "Verify Phone Number"
-msgstr ""
+msgstr "验证电话号码"
 
 #. <div class="btn btn-sm btn-success disabled me-1">@T["Verified"]</div>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Actions.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Actions"
 msgid "Verified"
-msgstr ""
+msgstr "已验证"
 
 #. <a asp-action="Index" asp-controller="SmsAuthenticator" class="btn btn-sm btn-primary me-1">@T["Edit"]</a>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Actions.cshtml:16
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Actions"
 msgid "Edit"
-msgstr ""
+msgstr "编辑"
 
 #. <h4>@T["SMS authentication"]</h4>
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Content.cshtml:1
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Content"
 msgid "SMS authentication"
-msgstr ""
+msgstr "短信认证"
 
 #. @T["Use your phone number to receive one-time codes."]
 #: OrchardCore.Users\Views\Items\TwoFactorMethod.Phone.Content.cshtml:3
 msgctxt "OrchardCore.Users.Views.Items.TwoFactorMethod.Phone.Content"
 msgid "Use your phone number to receive one-time codes."
-msgstr ""
+msgstr "使用您的电话号码接收一次性代码。"
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["View User"])</h1></zone>
 #: OrchardCore.Users\Views\User.DetailAdmin.cshtml:4
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr "用户已被禁用。"
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr "用户已经启用"
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr "取消选中以禁用此用户帐户。"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -2900,7 +2972,7 @@ msgstr "电子邮件"
 #: OrchardCore.Users\Views\UserInfo.cshtml:14
 msgctxt "OrchardCore.Users.Views.UserInfo"
 msgid "Phone Number"
-msgstr ""
+msgstr "电话号码"
 
 #. <dt>@T["Status"]</dt>
 #: OrchardCore.Users\Views\UserInfo.cshtml:18
@@ -2942,31 +3014,31 @@ msgstr "用户已登录。"
 #: OrchardCore.Users\Views\UserMenu.cshtml:13
 msgctxt "OrchardCore.Users.Views.UserMenu"
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. <i class="fa-solid fa-sign-in-alt fa-fw" aria-hidden="true"></i> @T["Log in"]
 #: OrchardCore.Users\Views\UserMenu.cshtml:27
 msgctxt "OrchardCore.Users.Views.UserMenu"
 msgid "Log in"
-msgstr ""
+msgstr "登录"
 
 #. <i class="fa-solid fa-envelope fa-fw" aria-hidden="true"></i> @T["Change Email"]
 #: OrchardCore.Users\Views\UserMenuItems-ChangeEmail.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-ChangeEmail"
 msgid "Change Email"
-msgstr ""
+msgstr "更改电子邮件"
 
 #. <i class="fa fa-desktop fa-fw" aria-hidden="true"></i> @T["Dashboard"]
 #: OrchardCore.Users\Views\UserMenuItems-Dashboard.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-Dashboard"
 msgid "Dashboard"
-msgstr ""
+msgstr "仪表板"
 
 #. <i class="fa-solid fa-user-lock fa-fw" aria-hidden="true"></i> @T["External Logins"]
 #: OrchardCore.Users\Views\UserMenuItems-ExternalLogins.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-ExternalLogins"
 msgid "External Logins"
-msgstr ""
+msgstr "外部登录"
 
 #. <i class="far fa-address-card" aria-hidden="true"></i> @T["Profile"]
 #. <i class="far fa-address-card" aria-hidden="true"></i> @T["Profile"]
@@ -2974,61 +3046,61 @@ msgstr ""
 #: OrchardCore.Users\Views\UserMenuItems-Profile.cshtml:17
 msgctxt "OrchardCore.Users.Views.UserMenuItems-Profile"
 msgid "Profile"
-msgstr ""
+msgstr "个人信息"
 
 #. @T["Signed in as"]<span class="ms-1 font-weight-bold">@User.Identity.Name</span>
 #: OrchardCore.Users\Views\UserMenuItems-SignedUser.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-SignedUser"
 msgid "Signed in as"
-msgstr ""
+msgstr "登录为"
 
 #. <i class="fa-solid fa-key" aria-hidden="true"></i> @T["Change password"]
 #: OrchardCore.Users\Views\UserMenuItems-SignOut.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-SignOut"
 msgid "Change password"
-msgstr ""
+msgstr "更改密码"
 
 #. <i class="fa-solid fa-sign-out-alt" aria-hidden="true"></i> @T["Log off"]
 #: OrchardCore.Users\Views\UserMenuItems-SignOut.cshtml:9
 msgctxt "OrchardCore.Users.Views.UserMenuItems-SignOut"
 msgid "Log off"
-msgstr ""
+msgstr "注销"
 
 #. <i class="fa-solid fa-shield-halved fa-fw" aria-hidden="true"></i> @T["Security"]
 #: OrchardCore.Users\Views\UserMenuItems-TwoFactor.cshtml:3
 msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
-msgstr ""
+msgstr "安全"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr "用户名"
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
-msgstr ""
+msgstr "电话号码"
 
 #. <i class="fas fa-check-circle text-success" title="@T["Verified"]"></i>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:11
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Verified"
-msgstr ""
+msgstr "已验证"
 
 #. <i class="fas fa-exclamation-circle" title="@T["Unverified"]"></i>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:15
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Unverified"
-msgstr ""
+msgstr "未验证"
 
 #. <span>@T["Phone number must include a country code. For example, +1 for United States."]</span>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:19
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
-msgstr ""
+msgstr "电话号码必须包含国家代码。例如，中国的电话号码+86。"
 
 #. <h6>@T["Roles"]</h6>
 #: OrchardCore.Users\Views\UserRoleFields.Edit.cshtml:5
@@ -3052,7 +3124,7 @@ msgstr "用户拥有的角色"
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Email.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Users.Views.Items.UsersAdminFilters-Email.Thumbnail"
 msgid "Email"
-msgstr ""
+msgstr "电子邮箱"
 
 #. <p>@T["Filters on the email address of a user."]</p>
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Email.Thumbnail.cshtml:8
@@ -3064,7 +3136,7 @@ msgstr "电子邮件地址筛选。"
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Name.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Users.Views.Items.UsersAdminFilters-Name.Thumbnail"
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. <p>@T["Filters on the name of a user."]</p>
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Name.Thumbnail.cshtml:8
@@ -3076,7 +3148,7 @@ msgstr "用户名筛选。"
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Role.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Users.Views.Items.UsersAdminFilters-Role.Thumbnail"
 msgid "Role"
-msgstr ""
+msgstr "角色"
 
 #. <p>@T["Filters on a role name."]</p>
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Role.Thumbnail.cshtml:8
@@ -3088,7 +3160,7 @@ msgstr "角色名称筛选。"
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Sort.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Users.Views.Items.UsersAdminFilters-Sort.Thumbnail"
 msgid "Sort"
-msgstr ""
+msgstr "排序"
 
 #. <p>@T["Orders by a user value."]</p>
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Sort.Thumbnail.cshtml:8
@@ -3100,7 +3172,7 @@ msgstr "按用户名排序。"
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Status.Thumbnail.cshtml:6
 msgctxt "OrchardCore.Users.Views.Items.UsersAdminFilters-Status.Thumbnail"
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. <p>@T["Filters on a user status."]</p>
 #: OrchardCore.Users\Views\Items\UsersAdminFilters-Status.Thumbnail.cshtml:8
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3390,43 +3462,43 @@ msgstr "用户已更新。"
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:6
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Two-Factor Authentication"
-msgstr ""
+msgstr "双重验证"
 
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="SmsAuthenticator">@T["Configure SMS Authenticator"]</a></li>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:7
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Configure SMS Authenticator"
-msgstr ""
+msgstr "配置短信验证器"
 
 #. <li class="breadcrumb-item active" aria-current="page">@RenderTitleSegments(T["SMS Code Validation"])</li>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:8
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "SMS Code Validation"
-msgstr ""
+msgstr "短信代码验证"
 
 #. @T["Please check your phone for a verification code and provide it below."]
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:13
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please check your phone for a verification code and provide it below."
-msgstr ""
+msgstr "请检查您的手机验证码并在下方提供。"
 
 #. <input asp-for="Code" class="form-control" autocomplete="off" placeholder="@T["Please enter the code"]" />
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:21
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
-msgstr ""
+msgstr "请输入代码"
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
-msgstr ""
+msgstr "验证码"
 
 #. <button type="submit" class="btn btn-lg btn-primary">@T["Verify"]</button>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:25
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verify"
-msgstr ""
+msgstr "验证"
 
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Validate User"])</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Design.cshtml:7
@@ -3440,17 +3512,17 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr "如果用户已被身份验证则设置“用户名称”工作流属性"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "角色"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
-msgstr "如果用户至少有一个选定的角色，则会触发“InRole”结果。"
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
+msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Thumbnail.cshtml:1
diff --git a/Localization/zh-Hans/OrchardCore.Widgets.po b/Localization/zh-Hans/OrchardCore.Widgets.po
index e1fe565d8b762..53847a6620c72 100644
--- a/Localization/zh-Hans/OrchardCore.Widgets.po
+++ b/Localization/zh-Hans/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "添加部件"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr "标准"
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/zh-Hans/OrchardCore.Workflows.po b/Localization/zh-Hans/OrchardCore.Workflows.po
index a81f81c7f0ca7..d00b8887ea488 100644
--- a/Localization/zh-Hans/OrchardCore.Workflows.po
+++ b/Localization/zh-Hans/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr "提交事务任务"
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr "会话（Session）"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr "无效"
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr "相关任务"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr "每个任务"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "迭 代"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr "转发任务"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr "循环任务"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "迭 代"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr "条件任务"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "正确的"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "错误的"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr "加入任务"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "加入"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr "日志任务"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "完成"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "异常"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr "通知任务"
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr "界面"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr "脚本任务"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr "设置输出任务"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr "设置属性任务"
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr "当循环任务时"
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "迭 代"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "完成"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr "活动更新成功。"
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr "最近创建"
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr "最近最少创建"
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr "故障"
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr "已完成"
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr "删除"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "工作流 {0} 已被删除。"
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr "删除"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "工作流 {0} 已被删除。"
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr "工作流已保存。"
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr "工作流 {0} 已删除"
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr "Http 重定向任务"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr "Http 请求事件"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "完成"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "匹配"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr "Http 请求任务"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "未处理的 Http 状态"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr "Http 响应任务"
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr "HTTP"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "完成"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr "未授权触发'{0}'。"
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "启动任务"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "编辑"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "添加"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "关联"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "返回"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "您确定要删除此工作流实例吗？"
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "删除"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr "高级"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "在高级标签中无效的锁定过期值"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "在恢复此类型的工作流实例之前，以毫秒为单位获取锁的超时。 将它留给零不使用任何锁定。"
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "可用事件"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "可用任务"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "确实要删除此活动吗?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "过滤"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr "高级"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr "在高级标签中无效的锁定超时值"
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr "在恢复此类型的工作流实例之前，以毫秒为单位获取锁的超时。 将它留给零不使用任何锁定。"
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr "迭代 <em>{0}</em> 经过 <em>{1}</em>"
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "要迭代的列表。 有 JavaScript 的支持。"
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "没有分支"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "从<em> {1} </em>到<em> {2} </em>迭代<em> {0} </em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "JavaScript支持的起始值。"
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "最终价值。有JavaScript支持。"
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "循环步骤值。支持 JavaScript。"
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1235,7 +1287,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "HTTP重定向"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1248,13 +1300,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "重定向到的URL。支持Liquid。"
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "永久的"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "\n"
@@ -1278,7 +1330,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "处理传入的HTTP请求"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1314,36 +1366,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "任何调用此 URL 的人都将触发此工作流。把它放在安全的地方。"
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "验证 Antiforgery 令牌"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "如果请求来自调用此 URL 作为 webhook 的服务, 请取消选中此选项。如果从表单请求此 URL, 请选中此选项以确保表单值未被篡改。"
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Token 生命周期"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "更改此值，点击 <b>重新生成</b> 按钮。"
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "令牌过期的天数。0表示令牌永不过期"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1362,7 +1426,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "筛选传入 HTTP 请求"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1374,7 +1438,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "要匹配的 HTTP 方法。"
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1386,7 +1450,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "要匹配的控制器名称。"
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1398,7 +1462,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "要匹配的操作名称。"
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1434,7 +1498,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr "<em>{0} {1}</em>"
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1446,7 +1510,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "要向其发送请求的 URL。支持流体语法。"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1458,7 +1522,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "HTTP 方法。例如: 获取、张贴、放置、修补、选项、头、删除"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1470,7 +1534,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "请求正文的内容类型。"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1482,7 +1546,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "用开机自检、放置和补丁请求发送的正文。流体支持。"
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1494,7 +1558,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "提供附加的 HTTP 头, 每行一个。例如: 授权: 持票人123ABC。流体支持。"
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1524,7 +1588,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP 响应："
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1536,7 +1600,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "HTTP 状态代码要发送。 <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">点击这里</a> 完成列表。"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1548,7 +1612,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "回复主体的内容类型。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1560,7 +1624,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "要回复的主体。有 Liquid 支持。"
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1596,7 +1660,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "评估 <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr "排序"
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr "您确定要删除此工作流实例吗？"
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "删除"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "已创建 {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>这里什么都没有!</strong> 目前没有停止的工作流。"
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "返回"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr "已选择"
@@ -1836,12 +1914,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr "禁用"
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 实例"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1875,7 +1952,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "在将执行加入到单个路径之前等待 <strong>任何</strong> 入站活动。"
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1905,7 +1982,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "日志"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1917,7 +1994,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "日记等级"
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1966,7 +2043,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0}通知"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1978,7 +2055,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "通知类型。"
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2008,7 +2085,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "脚本"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2020,7 +2097,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "可用结果的逗号分隔列表。"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2050,7 +2127,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "通过{0}输出"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2062,7 +2139,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "要输出的名称。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2092,7 +2169,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "设置{0}属性"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2104,7 +2181,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "要设置的属性。如果指定的属性尚不存在，则会添加该属性。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2141,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "当<em> {0} </em>被触发时"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2255,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr "<em>{0}</em>"
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2309,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "未指定用户操作"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2321,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "输入一个或多个逗号分隔的操作名称。"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2357,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "循环 <em>{0}</em> 为 true"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2381,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "在条件为 true 时迭代。"
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/zh-Hans/TheAdmin.po b/Localization/zh-Hans/TheAdmin.po
index 837cea5600cc6..7b5d428fd1db8 100644
--- a/Localization/zh-Hans/TheAdmin.po
+++ b/Localization/zh-Hans/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr "浅色模式"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr "深色模式"
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr "访问站点"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "折叠/展开菜单"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "删除"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "您确定要移除该元素吗？"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "确定"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "取消"
@@ -75,26 +53,52 @@ msgstr "筛选"
 #: TheAdmin\Views\Pager_First.cshtml:0
 msgctxt "TheAdmin.Views.Pager_First"
 msgid "Go to first page."
-msgstr ""
+msgstr "转到首页"
 
 #: TheAdmin\Views\Pager_Last.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Last"
 msgid "Go to last page."
-msgstr ""
+msgstr "转到末页"
 
 #: TheAdmin\Views\Pager_Next.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Next"
 msgid "Go to next page."
-msgstr ""
+msgstr "下一页"
 
 #: TheAdmin\Views\Pager_Previous.cshtml:0
 msgctxt "TheAdmin.Views.Pager_Previous"
 msgid "Go to previous page."
-msgstr ""
+msgstr "上一页"
 
 #. <nav aria-label="@T["Listing pages"]">
 #: TheAdmin\Views\Pager.cshtml:6
 msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
+msgstr "页面列表"
+
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
 msgstr ""
 
diff --git a/Localization/zh-Hans/TheAgencyTheme.po b/Localization/zh-Hans/TheAgencyTheme.po
index e44a0157dfb80..070d9fbc02dae 100644
--- a/Localization/zh-Hans/TheAgencyTheme.po
+++ b/Localization/zh-Hans/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr "未找到结果。"
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "找不到页面"
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr "你所请求的页面不存在！"
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/zh-Hans/TheBlogTheme.po b/Localization/zh-Hans/TheBlogTheme.po
index 0e77f1837619e..67ae62400cda5 100644
--- a/Localization/zh-Hans/TheBlogTheme.po
+++ b/Localization/zh-Hans/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "在 {0} 上"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr "未找到结果。"
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "无法找到页面"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/zh-Hans/TheTheme.po b/Localization/zh-Hans/TheTheme.po
index 1d0669d0dd86d..1ddb0c3ab0b95 100644
--- a/Localization/zh-Hans/TheTheme.po
+++ b/Localization/zh-Hans/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr "欢迎使用 Orchard Core, 您的网站已成功设置。"
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+
diff --git a/Localization/zh-Hant/OrchardCore.Admin.po b/Localization/zh-Hant/OrchardCore.Admin.po
index 573292336a588..2c143b807aee0 100644
--- a/Localization/zh-Hant/OrchardCore.Admin.po
+++ b/Localization/zh-Hant/OrchardCore.Admin.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:40\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Admin\AdminMenu.cs:26
@@ -33,13 +33,13 @@ msgid "Admin"
 msgstr "管理者"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Admin settings"
 msgstr "管理者設定"
 
 #. services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-#: OrchardCore.Admin\Startup.cs:92
+#: OrchardCore.Admin\Startup.cs:93
 msgctxt "OrchardCore.Admin.DeploymentStartup"
 msgid "Exports the admin settings."
 msgstr "匯出管理者設定"
@@ -50,23 +50,23 @@ msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Welcome to Orchard Core"
 msgstr "歡迎使用 Orchard Core CMS"
 
-#. <p>@T["Feel free to browse the menu and discover all its possibilities."]</p>
+#. <p class="mb-0">@T["Feel free to browse the menu and discover all its possibilities."]</p>
 #: OrchardCore.Admin\Views\AdminDashboard.cshtml:3
 msgctxt "OrchardCore.Admin.Views.AdminDashboard"
 msgid "Feel free to browse the menu and discover all its possibilities."
 msgstr "請從左邊選單尋找適合您使用的功能。"
 
-#. <label asp-for="DisplayDarkMode" class="form-check-label">@T["Enable dark mode admin theme"]</label>
+#. <label asp-for="DisplayThemeToggler" class="form-check-label">@T["Enable theme toggler"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Enable dark mode admin theme"
-msgstr "開啟管理者佈景主題深色模式"
+msgid "Enable theme toggler"
+msgstr ""
 
-#. <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
+#. <span class="hint">@T["Whether or not to display a theme toggler."]</span>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
-msgid "Whether a dark mode admin theme can be displayed."
-msgstr "是否使用夜間模式顯示."
+msgid "Whether or not to display a theme toggler."
+msgstr ""
 
 #. <label asp-for="DisplayMenuFilter" class="form-check-label">@T["Enable Admin Menu filter"]</label>
 #: OrchardCore.Admin\Views\AdminSettings.Edit.cshtml:14
@@ -104,9 +104,15 @@ msgctxt "OrchardCore.Admin.Views.AdminSettings.Edit"
 msgid "Whether the titles are displayed in the top bar."
 msgstr "標題是否顯示在頂部欄."
 
-#. <span class="icon"><i class="fa-solid fa-tachometer" aria-hidden="true"></i></span><span class="title">@T["Admin"]</span>
-#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:1
+#. <span class="title">@T["Admin"]</span>
+#: OrchardCore.Admin\Views\NavigationItemText-admin.Id.cshtml:4
 msgctxt "OrchardCore.Admin.Views.NavigationItemText-admin.Id"
 msgid "Admin"
 msgstr "管理者"
 
+#. <a href="@Url.Content("~/")" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
+#: OrchardCore.Admin\Views\VisitSiteNavbarItem.cshtml:2
+msgctxt "OrchardCore.Admin.Views.VisitSiteNavbarItem"
+msgid "Visit Site"
+msgstr ""
+
diff --git a/Localization/zh-Hant/OrchardCore.AdminDashboard.po b/Localization/zh-Hant/OrchardCore.AdminDashboard.po
index 5cc4d6471826b..36483c35ef474 100644
--- a/Localization/zh-Hant/OrchardCore.AdminDashboard.po
+++ b/Localization/zh-Hant/OrchardCore.AdminDashboard.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-19 00:47\n"
+"PO-Revision-Date: 2023-12-22 16:06\n"
 
 #. data-url-af="RemoveUrl UnsafeUrl" data-title="@T["Delete"]" data-message="@T["Are you sure you want to delete this content item?"]"
 #. data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]">@T["Delete"]</a>
@@ -102,19 +102,19 @@ msgctxt "OrchardCore.AdminDashboard.Views.Dashboard.UnpublishButton"
 msgid "No"
 msgstr "否"
 
-#. <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
+#. <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:5
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Position"
 msgstr "位置"
 
-#. <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
+#. <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:13
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Width"
 msgstr "寬度"
 
-#. <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
+#. <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
 #: OrchardCore.AdminDashboard\Views\DashboardPart.Edit.cshtml:21
 msgctxt "OrchardCore.AdminDashboard.Views.DashboardPart.Edit"
 msgid "Height"
diff --git a/Localization/zh-Hant/OrchardCore.AdminMenu.po b/Localization/zh-Hant/OrchardCore.AdminMenu.po
index 4d8f8be86405e..00e74be493587 100644
--- a/Localization/zh-Hant/OrchardCore.AdminMenu.po
+++ b/Localization/zh-Hant/OrchardCore.AdminMenu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.AdminMenu\AdminMenu.cs:29
@@ -140,13 +140,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create Admin Menu {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Name"
 msgstr "名稱"
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Create.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Create"
 msgid "Create"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create Node"
 msgstr ""
 
-#. <button class="btn btn-primary create" type="submit">@T["Create"]</button>
+#. <button class="btn btn-success create" type="submit">@T["Create"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Create.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Create"
 msgid "Create"
@@ -182,13 +182,13 @@ msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Edit Admin Menu: {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:9
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Name"
 msgstr "名稱"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Menu\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Menu.Edit"
 msgid "Save"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Edit Node"
 msgstr ""
 
-#. <label asp-for="Priority">@T["Selection Priority"]</label>
+#. <label asp-for="Priority" class="form-label">@T["Selection Priority"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:14
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Selection Priority"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The priority of this link to be displayed as active instead of another one when both are pointing to the same url. The link with the highest value has the active status in the navigation."
 msgstr ""
 
-#. <label asp-for="Position">@T["Position Order"]</label>
+#. <label asp-for="Position" class="form-label">@T["Position Order"]</label>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:20
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Position Order"
@@ -236,7 +236,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "The position order of this link in the admin menu."
 msgstr ""
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.AdminMenu\Views\Node\Edit.cshtml:26
 msgctxt "OrchardCore.AdminMenu.Views.Node.Edit"
 msgid "Save"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link"
 msgstr "連結"
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The Link Text as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="LinkUrl">@T["Link Url"]</label>
+#. <label asp-for="LinkUrl" class="form-label">@T["Link Url"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Link Url"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "The url of the link. A link will be shown only if it or one of their children have a url. The url will be relative to the root of the admin site"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:28
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
 #: OrchardCore.AdminMenu\Views\Items\LinkAdminNode.Fields.TreeEdit.cshtml:83
 msgctxt "OrchardCore.AdminMenu.Views.Items.LinkAdminNode.Fields.TreeEdit"
 msgid "Permissions"
@@ -569,7 +569,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Placeholder"
 msgstr ""
 
-#. <label asp-for="LinkText">@T["Link Text"]</label>
+#. <label asp-for="LinkText" class="form-label">@T["Link Text"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:15
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Link Text"
@@ -581,7 +581,7 @@ msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The text of the menu item as it will be shown in the tree."
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Icon"]</label>
 #: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:22
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Icon"
@@ -594,49 +594,49 @@ msgid "Pick"
 msgstr ""
 
 #. <span class="hint">@T["Select an icon to display when this menu item is at the first level."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:48
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:45
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select an icon to display when this menu item is at the first level."
 msgstr ""
 
 #. <h5 class="modal-title">@T["Pick an icon"]</h5>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:56
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:53
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <label asp-for="SelectedPermissionNames">@T["Permissions"]</label>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:76
+#. <label asp-for="SelectedPermissionNames" class="form-label">@T["Permissions"]</label>
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:73
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Permissions"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:101
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:98
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:108
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:105
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Select"
 msgstr "選擇"
 
 #. deselect-label="@T["Remove"]">
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:109
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:106
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "Remove"
 msgstr "刪除"
 
 #. @T["No result found"]
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:111
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "No result found"
 msgstr "找不到符合的結果"
 
 #. <span class="hint">@T["The permissions required to display this menu item (optional)."]</span>
-#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:117
+#: OrchardCore.AdminMenu\Views\Items\PlaceholderAdminNode.Fields.TreeEdit.cshtml:114
 msgctxt "OrchardCore.AdminMenu.Views.Items.PlaceholderAdminNode.Fields.TreeEdit"
 msgid "The permissions required to display this menu item (optional)."
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Alias.po b/Localization/zh-Hant/OrchardCore.Alias.po
index d0546c24f9d9d..039ebbc76e6f9 100644
--- a/Localization/zh-Hant/OrchardCore.Alias.po
+++ b/Localization/zh-Hant/OrchardCore.Alias.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:07\n"
 
 #. Description = S["the alias part of the content item"];
 #: OrchardCore.Alias\GraphQL\AliasInputObjectType.cs:13
@@ -42,13 +42,13 @@ msgctxt "OrchardCore.Alias.Models.AliasPartExtensions"
 msgid "Your alias is already in use. \"{0}\""
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Alias\Settings\AliasPartSettingsDisplayDriver.cs:44
 msgctxt "OrchardCore.Alias.Settings.AliasPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
+#. <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
 #: OrchardCore.Alias\Views\AliasPart.Edit.cshtml:11
 msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Alias"
@@ -65,13 +65,13 @@ msgctxt "OrchardCore.Alias.Views.AliasPart.Edit"
 msgid "Leave empty to re-generate it."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Alias\Views\AliasPart.Option.cshtml:4
 msgctxt "OrchardCore.Alias.Views.AliasPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Options"
@@ -89,7 +89,7 @@ msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Alias is generated and input is disabled"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Alias\Views\AliasPartSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Alias.Views.AliasPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hant/OrchardCore.ArchiveLater.po b/Localization/zh-Hant/OrchardCore.ArchiveLater.po
index 98d360f9b0ce1..0f8af27e16be1 100644
--- a/Localization/zh-Hant/OrchardCore.ArchiveLater.po
+++ b/Localization/zh-Hant/OrchardCore.ArchiveLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-primary text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.ArchiveLater">@T["Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Archive Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
-#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-archive-later" type="submit" name="submit.Publish" value="submit.CancelArchiveLater">@T["Cancel Archive Later"]</button>
+#: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Edit"
 msgid "Cancel Archive Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ArchiveLater\Views\ArchiveLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.ArchiveLater.Views.ArchiveLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/zh-Hant/OrchardCore.AuditTrail.po b/Localization/zh-Hant/OrchardCore.AuditTrail.po
index 4785216335e51..d01a928695e81 100644
--- a/Localization/zh-Hant/OrchardCore.AuditTrail.po
+++ b/Localization/zh-Hant/OrchardCore.AuditTrail.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:08\n"
 
 #. .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
 #: OrchardCore.AuditTrail\Navigation\AuditTrailAdminMenu.cs:26
@@ -38,13 +38,13 @@ msgctxt "OrchardCore.AuditTrail.Navigation.AuditTrailSettingsAdminMenu"
 msgid "Audit Trail"
 msgstr ""
 
-#. options.Categories.Insert(0, new SelectListItem(S["All categories"], String.Empty, String.IsNullOrEmpty(options.Category)));
+#. options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:78
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "All categories"
 msgstr ""
 
-#. new SelectListItem(S["Any date"], String.Empty, options.Date == String.Empty),
+#. new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
 #: OrchardCore.AuditTrail\Services\DefaultAuditTrailAdminListQueryService.cs:98
 msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Any date"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.AuditTrail.Services.DefaultAuditTrailAdminListQueryService"
 msgid "Custom time range"
 msgstr ""
 
-#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == String.Empty))
+#. .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
 #: OrchardCore.AuditTrail\Startup.cs:94
 msgctxt "OrchardCore.AuditTrail.Startup"
 msgid "Newest"
@@ -575,7 +575,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label class="" for="Categories">@T["Events to record"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Events to record"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailSettings.Edit.cshtml:12
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailSettings.Edit"
 msgid "Events to record"
@@ -629,7 +629,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Whether the trimming task is disabled."
 msgstr ""
 
-#. <label asp-for="RetentionDays">@T["Retention period"]</label>
+#. <label asp-for="RetentionDays" class="form-label">@T["Retention period"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:11
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Retention period"
@@ -641,7 +641,7 @@ msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "The number of days an event is retained."
 msgstr ""
 
-#. <label asp-for="LastRunUtc">@T["Last run"]</label>
+#. <label asp-for="LastRunUtc" class="form-label">@T["Last run"]</label>
 #: OrchardCore.AuditTrail\Views\AuditTrailTrimmingSettings.Edit.cshtml:17
 msgctxt "OrchardCore.AuditTrail.Views.AuditTrailTrimmingSettings.Edit"
 msgid "Last run"
diff --git a/Localization/zh-Hant/OrchardCore.Autoroute.po b/Localization/zh-Hant/OrchardCore.Autoroute.po
index 338533585af9f..281a67b57038e 100644
--- a/Localization/zh-Hant/OrchardCore.Autoroute.po
+++ b/Localization/zh-Hant/OrchardCore.Autoroute.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
 #: OrchardCore.Autoroute\Drivers\AutoroutePartDisplayDriver.cs:125
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Autoroute.Models.AutoroutePartExtensions"
 msgid "Your permalink is too long. The permalink can only be up to {0} characters."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Autoroute\Settings\AutoroutePartSettingsDisplayDriver.cs:59
 msgctxt "OrchardCore.Autoroute.Settings.AutoroutePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to disable autoroute for this content item."
 msgstr ""
 
-#. <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
+#. <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePart.Edit.cshtml:31
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Permalink"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Autoroute.Views.AutoroutePart.Edit"
 msgid "Check to specify that a child content item will be routed to an absolute path."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Autoroute\Views\AutoroutePartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Autoroute.Views.AutoroutePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hant/OrchardCore.BackgroundTasks.po b/Localization/zh-Hant/OrchardCore.BackgroundTasks.po
index 9da9c9288c49c..56a35cc5e8320 100644
--- a/Localization/zh-Hant/OrchardCore.BackgroundTasks.po
+++ b/Localization/zh-Hant/OrchardCore.BackgroundTasks.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-22 07:35\n"
+"PO-Revision-Date: 2023-12-22 16:09\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.BackgroundTasks\AdminMenu.cs:22
@@ -82,19 +82,19 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:23
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Title"
 msgstr ""
 
-#. <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
+#. <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:30
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Description"
 msgstr ""
 
-#. <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+#. <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:37
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Schedule"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:63
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock timeout (ms)"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Ignored if there is no distributed lock feature enabled."
 msgstr ""
 
-#. <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.BackgroundTasks\Views\BackgroundTask\Edit.cshtml:72
 msgctxt "OrchardCore.BackgroundTasks.Views.BackgroundTask.Edit"
 msgid "Lock expiration (ms)"
diff --git a/Localization/zh-Hant/OrchardCore.ContentFields.po b/Localization/zh-Hant/OrchardCore.ContentFields.po
index b3092f2b79841..bf3a2abf6cfad 100644
--- a/Localization/zh-Hant/OrchardCore.ContentFields.po
+++ b/Localization/zh-Hant/OrchardCore.ContentFields.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:23\n"
+"PO-Revision-Date: 2023-12-22 16:10\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #: OrchardCore.ContentFields\Drivers\ContentPickerFieldDisplayDriver.cs:108
@@ -364,19 +364,19 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanField-Switch.Option"
 msgid "Switch"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\BooleanField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.BooleanField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Hint"
@@ -388,7 +388,7 @@ msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Label">@T["Label"]</label>
+#. <label asp-for="Label" class="form-label">@T["Label"]</label>
 #: OrchardCore.ContentFields\Views\BooleanFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.BooleanFieldSettings.Edit"
 msgid "Label"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.DisplayOption"
 msgid "Standard"
@@ -426,37 +426,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:29
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:48
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:28
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Not published"
 msgstr "未上架"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:41
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:40
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:46
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:51
+#: OrchardCore.ContentFields\Views\ContentPickerField.Edit.cshtml:50
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\ContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerField.Option"
 msgid "Standard"
@@ -486,7 +486,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:30
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Contained Content Types"
@@ -499,7 +499,7 @@ msgid "Display All Content Types"
 msgstr ""
 
 #. @T["Content Types"]
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:41
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:62
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "All content types of these Stereotypes"
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:55
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Stereotypes"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:69
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -548,7 +548,7 @@ msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="TitlePattern">@T["Title Pattern"]</label>
+#. <label asp-for="TitlePattern" class="form-label">@T["Title Pattern"]</label>
 #: OrchardCore.ContentFields\Views\ContentPickerFieldSettings.Edit.cshtml:77
 msgctxt "OrchardCore.ContentFields.Views.ContentPickerFieldSettings.Edit"
 msgid "Title Pattern"
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateField-Localized.Option"
 msgid "Localized"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateField.Option"
 msgid "Standard"
@@ -590,7 +590,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "Hint"
@@ -602,13 +602,13 @@ msgctxt "OrchardCore.ContentFields.Views.DateFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\DateTimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.DateTimeField.Option"
 msgid "Standard"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\DateTimeFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.DateTimeFieldSettings.Edit"
 msgid "Hint"
@@ -662,31 +662,31 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\HtmlField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.HtmlField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\HtmlFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldSettings.Edit"
 msgid "Hint"
@@ -728,7 +728,7 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
 #: OrchardCore.ContentFields\Views\HtmlFieldTrumbowygEditorSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Enter the editor options"
@@ -740,20 +740,20 @@ msgctxt "OrchardCore.ContentFields.Views.HtmlFieldTrumbowygEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LinkField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LinkField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label asp-for="Url" class="@urlClass">@T["Url"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Url"
 msgstr ""
 
 #. <label asp-for="Text" class="@textClass">@T["Link text"]</label>
-#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\LinkField.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.LinkField.Edit"
 msgid "Link text"
 msgstr ""
@@ -770,7 +770,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Whether the url is required."
 msgstr ""
 
-#. <label asp-for="LinkTextMode">@T["Text"]</label>
+#. <label asp-for="LinkTextMode" class="form-label">@T["Text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Text"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Use the url of the link"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint for the url"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the url"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the url on the editor."
 msgstr ""
 
-#. <label asp-for="HintLinkText">@T["Hint for the text"]</label>
+#. <label asp-for="HintLinkText" class="form-label">@T["Hint for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Hint for the text"
@@ -824,7 +824,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "The hint text to display for the text of the link on the editor."
 msgstr ""
 
-#. <label asp-for="UrlPlaceholder">@T["Watermark for the url"]</label>
+#. <label asp-for="UrlPlaceholder" class="form-label">@T["Watermark for the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:36
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the url"
@@ -836,7 +836,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the url is empty."
 msgstr ""
 
-#. <label asp-for="TextPlaceholder">@T["Watermark for the text"]</label>
+#. <label asp-for="TextPlaceholder" class="form-label">@T["Watermark for the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Watermark for the text"
@@ -848,7 +848,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A hint (placeholder) to display when the input of the text is empty."
 msgstr ""
 
-#. <label asp-for="DefaultUrl">@T["Default value of the url"]</label>
+#. <label asp-for="DefaultUrl" class="form-label">@T["Default value of the url"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the url"
@@ -860,7 +860,7 @@ msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "A valid url proposed when creating a content item."
 msgstr ""
 
-#. <label asp-for="DefaultText">@T["Default value of the text"]</label>
+#. <label asp-for="DefaultText" class="form-label">@T["Default value of the text"]</label>
 #: OrchardCore.ContentFields\Views\LinkFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LinkFieldSettings.Edit"
 msgid "Default value of the text"
@@ -878,7 +878,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField"
 msgid "No content items."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.DisplayOption"
 msgid "Standard"
@@ -886,37 +886,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:33
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:32
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Not published"
 msgstr "未上架"
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:45
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:44
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:55
+#: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Edit.cshtml:54
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerField.Option"
 msgid "Standard"
@@ -946,7 +946,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="DisplayedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="DisplayedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Content Types"
@@ -958,7 +958,7 @@ msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettin
 msgid "The content types to display. Choose at least one."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\LocalizationSetContentPickerFieldSettings.Edit.cshtml:28
 msgctxt "OrchardCore.ContentFields.Views.LocalizationSetContentPickerFieldSettings.Edit"
 msgid "Hint"
@@ -995,25 +995,25 @@ msgid "Checkbox List"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:38
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:40
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:39
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No values found"]
-#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:50
+#: OrchardCore.ContentFields\Views\MultiTextField-Picker.Edit.cshtml:49
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField-Picker.Edit"
 msgid "No values found"
 msgstr ""
@@ -1029,13 +1029,13 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextField"
 msgid ", "
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\MultiTextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.MultiTextField.Option"
 msgid "Standard"
@@ -1053,7 +1053,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Hint"
@@ -1109,8 +1109,8 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:78
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:100
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
@@ -1123,7 +1123,7 @@ msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\MultiTextFieldSettings.Edit.cshtml:83
 msgctxt "OrchardCore.ContentFields.Views.MultiTextFieldSettings.Edit"
 msgid "Default value"
@@ -1154,7 +1154,7 @@ msgid "Range"
 msgstr ""
 
 #. <option value="">@T["None"]</option>
-#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:19
+#: OrchardCore.ContentFields\Views\NumericField-Select.Edit.cshtml:18
 msgctxt "OrchardCore.ContentFields.Views.NumericField-Select.Edit"
 msgid "None"
 msgstr ""
@@ -1177,13 +1177,13 @@ msgctxt "OrchardCore.ContentFields.Views.NumericField-Spinner.Option"
 msgid "Spinner"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
 #: OrchardCore.ContentFields\Views\NumericField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.NumericField.Option"
 msgid "Number"
@@ -1201,7 +1201,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Hint"
@@ -1213,7 +1213,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="Placeholder">@T["Watermark (placeholder)"]</label>
+#. <label for="Placeholder" class="form-label">@T["Watermark (placeholder)"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Watermark (placeholder)"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "A hint to display when the input is empty. (optional)"
 msgstr ""
 
-#. <label for="Scale">@T["Scale"]</label>
+#. <label for="Scale" class="form-label">@T["Scale"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Scale"
@@ -1237,7 +1237,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The number of digits after the decimal point."
 msgstr ""
 
-#. <label for="Minimum">@T["Minimum"]</label>
+#. <label for="Minimum" class="form-label">@T["Minimum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Minimum"
@@ -1249,7 +1249,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The minimum value allowed. (optional)"
 msgstr ""
 
-#. <label for="Maximum">@T["Maximum"]</label>
+#. <label for="Maximum" class="form-label">@T["Maximum"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Maximum"
@@ -1261,7 +1261,7 @@ msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "The maximum value allowed. (optional)"
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\NumericFieldSettings.Edit.cshtml:61
 msgctxt "OrchardCore.ContentFields.Views.NumericFieldSettings.Edit"
 msgid "Default value"
@@ -1333,19 +1333,19 @@ msgctxt "OrchardCore.ContentFields.Views.TextField-Url.Option"
 msgid "Url"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TextField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Level">@T["Select the header level to use"]</label>
+#. <label asp-for="Level" class="form-label">@T["Select the header level to use"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldHeaderDisplaySettings.Edit.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "Select the header level to use"
@@ -1387,14 +1387,14 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldHeaderDisplaySettings.Edit"
 msgid "H6"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options."]</label>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options."]</label>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Enter the editor options."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.ContentFields\Views\TextFieldMonacoEditorSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldMonacoEditorSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -1443,8 +1443,8 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="options-textarea">@T["Options"]</label>
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label for="options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:63
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:95
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
@@ -1457,7 +1457,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-defaultvalue">@T["Default value"]</label>
+#. <label for="options-defaultvalue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:68
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "Default value"
@@ -1481,7 +1481,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.E
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Editor">@T["What type of list editor should be used?"]</label>
+#. <label asp-for="Editor" class="form-label">@T["What type of list editor should be used?"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldPredefinedListEditorSettings.Edit.cshtml:85
 msgctxt "OrchardCore.ContentFields.Views.TextFieldPredefinedListEditorSettings.Edit"
 msgid "What type of list editor should be used?"
@@ -1511,7 +1511,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Hint"
@@ -1523,7 +1523,7 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label for="DefaultValue">@T["Default value"]</label>
+#. <label for="DefaultValue" class="form-label">@T["Default value"]</label>
 #: OrchardCore.ContentFields\Views\TextFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "Default value"
@@ -1535,13 +1535,13 @@ msgctxt "OrchardCore.ContentFields.Views.TextFieldSettings.Edit"
 msgid "The default value. (optional)"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\TimeField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.TimeField.Option"
 msgid "Standard"
@@ -1559,7 +1559,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Step">@T["Step"]</label>
+#. <label asp-for="Step" class="form-label">@T["Step"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:12
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Step"
@@ -1577,7 +1577,7 @@ msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "For seconds use a divisor of 60 e.g. '15', for ms a decimal equal to a divisor of 1000 divided by 1000 e.g. '0.250'."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\TimeFieldSettings.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.TimeFieldSettings.Edit"
 msgid "Hint"
@@ -1607,7 +1607,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerField"
 msgid "No users."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.DisplayOption"
 msgid "Standard"
@@ -1615,37 +1615,37 @@ msgstr ""
 
 #. <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 #. <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:30
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:49
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:29
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:48
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Not enabled"
 msgstr ""
 
 #. label="displayText" placeholder="@T["Type to search"]"
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:42
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:41
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Select"
 msgstr ""
 
 #. select-label="@T["Select"]" deselect-label="@T["Remove"]">
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:47
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:46
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "Remove"
 msgstr ""
 
 #. @T["No result found"]
-#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:52
+#: OrchardCore.ContentFields\Views\UserPickerField.Edit.cshtml:51
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Edit"
 msgid "No result found"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\UserPickerField.Option.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.UserPickerField.Option"
 msgid "Standard"
@@ -1675,7 +1675,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow multiple elements to be selected."
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:22
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Roles"
@@ -1699,7 +1699,7 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Whether to allow picker to display users from all roles."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.ContentFields\Views\UserPickerFieldSettings.Edit.cshtml:47
 msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "Hint"
@@ -1711,56 +1711,56 @@ msgctxt "OrchardCore.ContentFields.Views.UserPickerFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.ContentFields\Views\YoutubeField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.ContentFields.Views.YoutubeField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:12
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:6
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Required"
 msgstr ""
 
 #. <span class="hint dashed">@T["Whether a value is required."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:7
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:19
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:13
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Hint"
 msgstr ""
 
 #. <span class="hint">@T["The hint text to display for this field on the editor."]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:22
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:16
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr ""
 
-#. <label asp-for="Width">@T["Width"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:27
+#. <label asp-for="Width" class="form-label">@T["Width"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:21
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Width"
 msgstr ""
 
 #. <span class="hint">@T["The width of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:30
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:24
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The width of the Videobox"
 msgstr ""
 
-#. <label asp-for="Height">@T["Height"]</label>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:35
+#. <label asp-for="Height" class="form-label">@T["Height"]</label>
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:29
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "Height"
 msgstr ""
 
 #. <span class="hint">@T["The height of the Videobox"]</span>
-#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:38
+#: OrchardCore.ContentFields\Views\YoutubeFieldSetting.Edit.cshtml:32
 msgctxt "OrchardCore.ContentFields.Views.YoutubeFieldSetting.Edit"
 msgid "The height of the Videobox"
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.ContentLocalization.po b/Localization/zh-Hant/OrchardCore.ContentLocalization.po
index 8bbeda9b77554..b25f6d2ab4be7 100644
--- a/Localization/zh-Hant/OrchardCore.ContentLocalization.po
+++ b/Localization/zh-Hant/OrchardCore.ContentLocalization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:47\n"
+"PO-Revision-Date: 2023-12-22 16:11\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.ContentLocalization\AdminMenu.cs:28
@@ -64,7 +64,7 @@ msgctxt "OrchardCore.ContentLocalization.Controllers.AdminController"
 msgid "Could not create localized version of the content item."
 msgstr ""
 
-#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = String.IsNullOrEmpty(m.SelectedCulture) }
+#. new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
 #: OrchardCore.ContentLocalization\Drivers\LocalizationContentsAdminListDisplayDriver.cs:45
 msgctxt "OrchardCore.ContentLocalization.Drivers.LocalizationContentsAdminListDisplayDriver"
 msgid "All cultures"
diff --git a/Localization/zh-Hant/OrchardCore.ContentPreview.po b/Localization/zh-Hant/OrchardCore.ContentPreview.po
index a2b05ac9bce15..30e5c10d4967c 100644
--- a/Localization/zh-Hant/OrchardCore.ContentPreview.po
+++ b/Localization/zh-Hant/OrchardCore.ContentPreview.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.ContentPreview\Settings\PreviewPartSettingsDisplayDriver.cs:46
 msgctxt "OrchardCore.ContentPreview.Settings.PreviewPartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <a id="previewButton" target="_blank" class="btn btn-info" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+#. <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 #: OrchardCore.ContentPreview\Views\ContentPreview.Button.cshtml:13
 msgctxt "OrchardCore.ContentPreview.Views.ContentPreview.Button"
 msgid "Preview"
 msgstr "預覽"
 
 #. <span>@T["Preview Disconnected"] </span>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:14
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Disconnected"
 msgstr ""
 
 #. <p>@T["Preview Error"] </p>
-#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:19
+#: OrchardCore.ContentPreview\Views\Preview\Index.cshtml:20
 msgctxt "OrchardCore.ContentPreview.Views.Preview.Index"
 msgid "Preview Error"
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.ContentPreview\Views\PreviewPartSettings.Edit.cshtml:15
 msgctxt "OrchardCore.ContentPreview.Views.PreviewPartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hant/OrchardCore.ContentTypes.po b/Localization/zh-Hant/OrchardCore.ContentTypes.po
index 4c7d970a001b1..a35988fe21d5b 100644
--- a/Localization/zh-Hant/OrchardCore.ContentTypes.po
+++ b/Localization/zh-Hant/OrchardCore.ContentTypes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-10 11:59\n"
+"PO-Revision-Date: 2023-12-22 16:12\n"
 
 #. builder.Add(S["Content"], content => content
 #: OrchardCore.ContentTypes\AdminMenu.cs:28
@@ -48,16 +48,16 @@ msgstr ""
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #. ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
 #: OrchardCore.ContentTypes\Controllers\AdminController.cs:101
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:354
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:647
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:773
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:942
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:355
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:648
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:774
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:943
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Display Name can't be empty."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:106
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:107
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Display Name already exists."
 msgstr ""
@@ -66,10 +66,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
 #. ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:111
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:379
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:464
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:657
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:112
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:380
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:465
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:658
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name can't be empty."
 msgstr ""
@@ -78,10 +78,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
 #. ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:116
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:364
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:474
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:667
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:117
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:365
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:475
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:668
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name must start with a letter."
 msgstr ""
@@ -90,10 +90,10 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
 #. ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:121
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:369
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:479
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:672
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:122
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:370
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:480
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:673
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name contains invalid characters."
 msgstr ""
@@ -101,133 +101,133 @@ msgstr ""
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
 #. ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:126
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:374
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:484
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:127
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:375
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:485
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The Technical Name is reserved for internal use."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:131
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A type with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:144
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:145
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content type has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:203
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:204
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
 #. await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:227
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:580
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:228
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:581
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "\"{0}\" has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:316
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:397
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:317
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:398
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been added."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:359
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:947
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:360
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:948
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
 #. ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:384
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:469
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:385
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:470
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A part with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:419
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part has been removed."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["The content part could not be created."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:496
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:497
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The content part could not be created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:500
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:501
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" content part has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:556
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:557
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The settings of \"{0}\" have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["There are no fields."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:596
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:597
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "There are no fields."
 msgstr ""
 
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
 #. ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:652
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:778
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:653
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:779
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Display Name already exists."
 msgstr ""
 
 #. ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:662
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:663
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "A field with the same Technical Name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:688
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:689
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The field \"{0}\" has been added."
 msgstr ""
 
 #. await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:791
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:792
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "Display name changed to {0}."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:810
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:811
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field settings have been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:854
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:855
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" field has been removed."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-#: OrchardCore.ContentTypes\Controllers\AdminController.cs:973
+#: OrchardCore.ContentTypes\Controllers\AdminController.cs:974
 msgctxt "OrchardCore.ContentTypes.Controllers.AdminController"
 msgid "The \"{0}\" part settings have been saved."
 msgstr ""
@@ -245,7 +245,7 @@ msgid "The Content Type name can't be empty."
 msgstr ""
 
 #. throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:287
+#: OrchardCore.ContentTypes\Services\ContentDefinitionService.cs:281
 msgctxt "OrchardCore.ContentTypes.Services.ContentDefinitionService"
 msgid "Cannot add part named '{0}'. It already exists."
 msgstr ""
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Add New Field To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:16
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Display Name"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddFieldTo.cshtml:24
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddFieldTo"
 msgid "Technical Name"
@@ -328,7 +328,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Add Named Part To \"{0}\""
 msgstr ""
 
-#. <label for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:14
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Display Name"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Name of the reusable part as it will be displayed in screens."
 msgstr ""
 
-#. <label for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:20
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical Name"
@@ -352,7 +352,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Technical name of the reusable part."
 msgstr ""
 
-#. <label for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\AddReusablePartTo.cshtml:26
 msgctxt "OrchardCore.ContentTypes.Views.Admin.AddReusablePartTo"
 msgid "Description"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.ContentDefinitionDeploymentStep.Fi
 msgid "Exports specified content type and part definitions for updating."
 msgstr ""
 
-#. <label asp-for="ContentPartDefinition.Name">@T["Technical Name"]</label>
+#. <label asp-for="ContentPartDefinition.Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical Name"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Technical name of the part."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Display Name"
@@ -454,7 +454,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Name of the part as it will be displayed in screens. Leave empty to use defaults."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentPartSettings.Edit.cshtml:17
 msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Description"
@@ -490,7 +490,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentPartSettings.Edit"
 msgid "Check to allow this part to be attached multiple times."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical Name"
@@ -502,7 +502,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Technical name of the type."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\ContentType.Edit.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Display Name"
@@ -514,7 +514,7 @@ msgctxt "OrchardCore.ContentTypes.Views.ContentType.Edit"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\ContentTypeSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ContentTypes.Views.ContentTypeSettings.Edit"
 msgid "Description"
@@ -604,7 +604,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "New Content Type"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Display Name"
@@ -616,7 +616,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Name of the type as it will be displayed on screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Create"
 msgid "Technical Name"
@@ -640,7 +640,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "New Content Part"
 msgstr ""
 
-#. <label for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\CreatePart.cshtml:8
 msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Name"
@@ -658,7 +658,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.CreatePart"
 msgid "Create"
 msgstr ""
 
-#. <label asp-for="ContentTypes">@T["Content Type Definitions"]</label>
+#. <label asp-for="ContentTypes" class="form-label">@T["Content Type Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Type Definitions"
@@ -670,7 +670,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentS
 msgid "A comma separated list of content type definitions to delete"
 msgstr ""
 
-#. <label asp-for="ContentParts">@T["Content Part Definitions"]</label>
+#. <label asp-for="ContentParts" class="form-label">@T["Content Part Definitions"]</label>
 #: OrchardCore.ContentTypes\Views\Items\DeleteContentDefinitionDeploymentStep.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.ContentTypes.Views.Items.DeleteContentDefinitionDeploymentStep.Fields.Edit"
 msgid "Content Part Definitions"
@@ -701,87 +701,87 @@ msgid "Exports specified content type and part definitions for deletion."
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:34
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:50
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit Content Type - {0}"
 msgstr ""
 
 #. <h3>@T["Fields"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:53
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:69
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Fields"
 msgstr ""
 
-#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
+#. <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
 #. <a asp-route-action="EditTypePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:63
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:109
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:79
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:125
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Edit"
 msgstr "編輯"
 
-#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
+#. <a asp-route-action="RemoveFieldFrom" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
 #. <a asp-route-action="RemovePart" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@partDefinition.Name" class="btn btn-danger btn-sm" role="button" data-url-af="UnsafeUrl RemoveUrl">@T["Remove"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:65
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:110
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:81
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:126
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Remove"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefinition.DisplayMode()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:71
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:120
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:136
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Display mode"
 msgstr ""
 
-#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
+#. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefinition.Editor()</span>
 #. <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:75
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:124
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:91
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Editor"
 msgstr ""
 
 #. <a asp-route-action="AddFieldTo" asp-route-id="@Model.TypeDefinition.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-info btn-sm" role="button">@T["Add Field"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:87
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:103
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Field"
 msgstr ""
 
 #. <h3>@T["Parts"]</h3>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:92
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:108
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Parts"
 msgstr ""
 
 #. <span class="hint dashed">@T["Contains the fields for the current type"]</span>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:115
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:131
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Contains the fields for the current type"
 msgstr ""
 
 #. <a asp-route-action="AddPartsTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Parts"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:134
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:150
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Parts"
 msgstr ""
 
 #. <a asp-route-action="AddReusablePartTo" asp-route-id="@Model.TypeDefinition.Name" class="btn btn-info btn-sm" role="button">@T["Add Named Part"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:135
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:151
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Add Named Part"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:139
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:155
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Save"
 msgstr ""
 
 #. <button class="btn btn-danger delete" type="submit" name="submit.Delete" value="Delete" data-url-af="RemoveUrl">@T["Delete"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:140
+#: OrchardCore.ContentTypes\Views\Admin\Edit.cshtml:156
 msgctxt "OrchardCore.ContentTypes.Views.Admin.Edit"
 msgid "Delete"
 msgstr ""
@@ -792,7 +792,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "\"{0}\" settings for \"{1}\""
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:25
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Display Name"
@@ -804,7 +804,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Name of the field as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Name">@T["Technical Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Technical Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:33
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical Name"
@@ -816,26 +816,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Technical name of the field."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:56
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:55
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:77
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:74
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:96
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:92
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:99
+#: OrchardCore.ContentTypes\Views\Admin\EditField.cshtml:95
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditField"
 msgid "Cancel"
 msgstr "取消"
@@ -900,7 +900,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:29
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Display Name"
@@ -912,7 +912,7 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Name of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:37
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Description"
@@ -924,26 +924,26 @@ msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "The description of the part as it will be displayed in screens."
 msgstr ""
 
-#. <label asp-for="Editor">@T["What type of editor should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:61
+#. <label asp-for="Editor" class="form-label">@T["What type of editor should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:60
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of editor should be used?"
 msgstr ""
 
-#. <label asp-for="DisplayMode">@T["What type of display mode should be used?"]</label>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:82
+#. <label asp-for="DisplayMode" class="form-label">@T["What type of display mode should be used?"]</label>
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:79
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "What type of display mode should be used?"
 msgstr ""
 
 #. <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:101
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:97
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Save"
 msgstr ""
 
 #. <a class="btn btn-secondary cancel" role="button" asp-route-action="Edit" asp-route-id="@Model.TypePartDefinition.ContentTypeDefinition.Name">@T["Cancel"]</a>
-#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:102
+#: OrchardCore.ContentTypes\Views\Admin\EditTypePart.cshtml:98
 msgctxt "OrchardCore.ContentTypes.Views.Admin.EditTypePart"
 msgid "Cancel"
 msgstr "取消"
diff --git a/Localization/zh-Hant/OrchardCore.Contents.po b/Localization/zh-Hant/OrchardCore.Contents.po
index ca8be680fea43..08750430c255d 100644
--- a/Localization/zh-Hant/OrchardCore.Contents.po
+++ b/Localization/zh-Hant/OrchardCore.Contents.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:24\n"
+"PO-Revision-Date: 2023-12-22 16:13\n"
 
 #. await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
 #: OrchardCore.Contents\AdminMenu.cs:60
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "The {0} has been unpublished."
 msgstr "{0} 已下架"
 
-#. items.Add(new SelectListItem(S["All content types"], String.Empty));
+#. items.Add(new SelectListItem(S["All content types"], string.Empty));
 #: OrchardCore.Contents\Controllers\AdminController.cs:713
 msgctxt "OrchardCore.Contents.Controllers.AdminController"
 msgid "All content types"
@@ -342,8 +342,8 @@ msgstr "所有的內容類型"
 
 #. Title = S["One or more validation errors occurred."],
 #. Title = S["One or more validation errors occurred."],
-#: OrchardCore.Contents\Controllers\ApiController.cs:133
-#: OrchardCore.Contents\Controllers\ApiController.cs:163
+#: OrchardCore.Contents\Controllers\ApiController.cs:132
+#: OrchardCore.Contents\Controllers\ApiController.cs:162
 msgctxt "OrchardCore.Contents.Controllers.ApiController"
 msgid "One or more validation errors occurred."
 msgstr ""
@@ -439,13 +439,13 @@ msgid "Exports the content audit trail settings."
 msgstr ""
 
 #. public override LocalizedString Category => S["Content"];
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:36
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:40
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Content"
 msgstr "內容"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:49
+#: OrchardCore.Contents\Workflows\Activities\ContentActivity.cs:53
 msgctxt "OrchardCore.Contents.Workflows.Activities.ContentActivity"
 msgid "Done"
 msgstr "完成"
@@ -889,7 +889,7 @@ msgctxt "OrchardCore.Contents.Views.Items.AuditTrailContentsAction_SummaryAdmin"
 msgid "Audit Trail"
 msgstr ""
 
-#. <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
+#. <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
 #: OrchardCore.Contents\Views\AuditTrailPart.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.AuditTrailPart.Edit"
 msgid "Comment"
@@ -919,7 +919,7 @@ msgctxt "OrchardCore.Contents.Views.AuditTrailPartSettings.Edit"
 msgid "Whether the audit trail comment is shown while editing."
 msgstr ""
 
-#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
+#. <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Date.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "Created"
@@ -931,7 +931,7 @@ msgctxt "OrchardCore.Contents.Views.CommonPart-Date.Edit"
 msgid "The date when the content item was created or first published."
 msgstr ""
 
-#. <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
+#. <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
 #: OrchardCore.Contents\Views\CommonPart-Owner.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.CommonPart-Owner.Edit"
 msgid "Owner"
@@ -967,13 +967,13 @@ msgctxt "OrchardCore.Contents.Views.CommonPartSettings.Edit"
 msgid "Check to be able to edit the owner of the content item. The <code>EditContentOwner</code> permission will also be required."
 msgstr ""
 
-#. <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
+#. <a class="btn btn-secondary cancel mb-1" role="button" href="@returnUrl">@T["Cancel"]</a>
 #: OrchardCore.Contents\Views\Content.Edit.cshtml:35
 msgctxt "OrchardCore.Contents.Views.Content.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
+#. <button type="submit" name="submit.Publish" class="btn btn-success publish mb-1" value="submit.Publish">@T["Publish"]</button>
 #. <button class="btn btn-success publish" type="submit" name="submit.Publish" value="submit.Publish">@T["Publish"]</button>
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.PublishButton.cshtml:12
@@ -993,7 +993,7 @@ msgctxt "OrchardCore.Contents.Views.Content.PublishButton"
 msgid "and continue"
 msgstr ""
 
-#. <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
+#. <button class="primaryAction btn btn-primary draft mb-1" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #. <button class="btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:7
 #: OrchardCore.Contents\Views\Content.SaveDraftButton.cshtml:12
@@ -1027,7 +1027,7 @@ msgctxt "OrchardCore.Contents.Views.Content.SummaryAdmin"
 msgid "Actions"
 msgstr "操作"
 
-#. <label asp-for="AllowedContentTypes">@T["Allowed content types"]</label>
+#. <label asp-for="AllowedContentTypes" class="form-label">@T["Allowed content types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentAuditTrailSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Contents.Views.Items.ContentAuditTrailSettings.Edit"
 msgid "Allowed content types"
@@ -1057,7 +1057,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentCreatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentCreatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1093,7 +1093,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDeletedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeletedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1153,7 +1153,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Content"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentDeploymentStep.Fields.Summary.cshtml:21
 msgctxt "OrchardCore.Contents.Views.Items.ContentDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1183,7 +1183,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentDraftSavedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1207,7 +1207,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentDraftSavedEvent.Fields.Thumbnai
 msgid "Content Draft is saved."
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item Id"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item Id"]</label>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Edit.cshtml:3
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Edit"
 msgid "Content Item Id"
@@ -1225,7 +1225,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summa
 msgid "Content Item"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentItemDeploymentStep.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Contents.Views.Items.ContentItemDeploymentStep.Fields.Summary"
 msgid "Nothing here!"
@@ -1255,7 +1255,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentPublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentPublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -1733,7 +1733,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Show All Content Types"
 msgstr ""
 
-#. <label asp-for="IconClass">@T["Default Icon"]</label>
+#. <label asp-for="IconClass" class="form-label">@T["Default Icon"]</label>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeEdit.cshtml:27
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Default Icon"
@@ -1775,13 +1775,13 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeEdit"
 msgid "Pick an icon"
 msgstr ""
 
-#. <span class="badge bg-success">@T["Show all Content Types"]</span>
+#. <span class="badge text-bg-success">@T["Show all Content Types"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:26
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Show all Content Types"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesAdminNode.Fields.TreeSummary.cshtml:39
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesAdminNode.Fields.TreeSummary"
 msgid "Nothing here!"
@@ -1831,9 +1831,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "Limit the amount of content items to provide from this source. Note: Only one content type is selectable when this option is selected."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="ContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
-#. <label asp-for="LimitedContentTypes[i].ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="ContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
+#. <label asp-for="LimitedContentTypes[i].ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:26
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:77
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:135
@@ -1847,9 +1847,9 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.Edit"
 msgid "The default frequency with which these content types are likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
-#. <label asp-for="ContentTypes[i].Priority">@T["Priority"] </label>
-#. <label asp-for="LimitedContentTypes[i].Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="ContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
+#. <label asp-for="LimitedContentTypes[i].Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:31
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:84
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.Edit.cshtml:142
@@ -2025,7 +2025,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["Nothing here!"]</span>
+#. <span class="badge text-bg-warning">@T["Nothing here!"]</span>
 #: OrchardCore.Contents\Views\Items\ContentTypesSitemapSource.SummaryAdmin.cshtml:36
 msgctxt "OrchardCore.Contents.Views.Items.ContentTypesSitemapSource.SummaryAdmin"
 msgid "Nothing here!"
@@ -2061,7 +2061,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUnpublishedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUnpublishedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2097,7 +2097,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentUpdatedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentUpdatedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2133,7 +2133,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Design"
 msgid "Any content type"
 msgstr ""
 
-#. <label asp-for="SelectedContentTypeNames">@T["Content Types"]</label>
+#. <label asp-for="SelectedContentTypeNames" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Contents\Views\Items\ContentVersionedEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.ContentVersionedEvent.Fields.Edit"
 msgid "Content Types"
@@ -2169,7 +2169,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Design"
 msgid "Create Content"
 msgstr ""
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Type"
@@ -2193,7 +2193,7 @@ msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Check if you want the content item to be published when being created. Leave unchecked to create a draft version."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\CreateContentTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Contents.Views.Items.CreateContentTask.Fields.Edit"
 msgid "Content Properties"
@@ -2235,7 +2235,7 @@ msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Design"
 msgid "Delete content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\DeleteContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.DeleteContentTask.Fields.Edit"
 msgid "Expression"
@@ -2283,37 +2283,37 @@ msgctxt "OrchardCore.Contents.Views.Download.Display"
 msgid "Cancel"
 msgstr "取消"
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item">@T["View Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:15
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Draft as JSON"
 msgstr ""
 
-#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+#. <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:16
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Draft as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View Published as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:22
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View Published as JSON"
 msgstr ""
 
-#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
+#. <a id="@exportPublishedId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download Published as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:23
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download Published as JSON"
 msgstr ""
 
-#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item btn btn-primary btn-sm">@T["View as JSON"]</a>
+#. <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" class="dropdown-item">@T["View as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:28
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "View as JSON"
 msgstr ""
 
-#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
+#. <a id="@exportId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" class="dropdown-item" data-url-af="UnsafeUrl">@T["Download as JSON"]</a>
 #: OrchardCore.Contents\Views\Items\Download-Button-Actions.SummaryAdmin.cshtml:29
 msgctxt "OrchardCore.Contents.Views.Items.Download-Button-Actions.SummaryAdmin"
 msgid "Download as JSON"
@@ -2343,7 +2343,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Action
 msgid "Cancel"
 msgstr "取消"
 
-#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+#. <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml:13
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin"
 msgid "Export Draft to Deployment Target"
@@ -2433,7 +2433,7 @@ msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSetting
 msgid "No export content to deployment target plans found. Create a deployment plan and add a Export content to deployment target step to it."
 msgstr ""
 
-#. <label asp-for="ExportContentToDeploymentTargetPlanId">@T["Deployment Plan"]</label>
+#. <label asp-for="ExportContentToDeploymentTargetPlanId" class="form-label">@T["Deployment Plan"]</label>
 #: OrchardCore.Contents\Views\Items\ExportContentToDeploymentTargetSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Contents.Views.Items.ExportContentToDeploymentTargetSettings.Edit"
 msgid "Deployment Plan"
@@ -2509,8 +2509,8 @@ msgctxt "OrchardCore.Contents.Views.NavigationItemText-content.Id"
 msgid "Content"
 msgstr ""
 
-#. <span class="icon"><i class="far fa-plus-square" aria-hidden="true"></i></span><span class="title">@T["New"]</span>
-#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:1
+#. <span class="title">@T["New"]</span>
+#: OrchardCore.Contents\Views\NavigationItemText-new.Id.cshtml:4
 msgctxt "OrchardCore.Contents.Views.NavigationItemText-new.Id"
 msgid "New"
 msgstr ""
@@ -2533,7 +2533,7 @@ msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Design"
 msgid "Publish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\PublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.PublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2575,7 +2575,7 @@ msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Design"
 msgid "Retrieve content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemId">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemId" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\RetrieveContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.RetrieveContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2617,7 +2617,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Design"
 msgid "Unpublish content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="Expression">@T["Expression"]</label>
+#. <label asp-for="Expression" class="form-label">@T["Expression"]</label>
 #: OrchardCore.Contents\Views\Items\UnpublishContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UnpublishContentTask.Fields.Edit"
 msgid "Expression"
@@ -2659,7 +2659,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Design"
 msgid "Update content using expression: <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="ContentItemIdExpression">@T["Content Item ID"]</label>
+#. <label asp-for="ContentItemIdExpression" class="form-label">@T["Content Item ID"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Item ID"
@@ -2671,7 +2671,7 @@ msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Enter a JavaScript expression that evaluates to the Content Item's ID (ContentItemId) to be updated. For example: correlationId()."
 msgstr ""
 
-#. <label asp-for="ContentProperties">@T["Content Properties"]</label>
+#. <label asp-for="ContentProperties" class="form-label">@T["Content Properties"]</label>
 #: OrchardCore.Contents\Views\Items\UpdateContentTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Contents.Views.Items.UpdateContentTask.Fields.Edit"
 msgid "Content Properties"
diff --git a/Localization/zh-Hant/OrchardCore.CustomSettings.po b/Localization/zh-Hant/OrchardCore.CustomSettings.po
index c4bb2b5c4294f..d8470f026b33c 100644
--- a/Localization/zh-Hant/OrchardCore.CustomSettings.po
+++ b/Localization/zh-Hant/OrchardCore.CustomSettings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:50\n"
+"PO-Revision-Date: 2023-12-22 16:14\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.CustomSettings\AdminMenu.cs:33
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fie
 msgid "Custom Settings"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:12
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No custom settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No custom settings selected."]</span>
 #: OrchardCore.CustomSettings\Views\Items\CustomSettingsDeploymentStep.Fields.Summary.cshtml:23
 msgctxt "OrchardCore.CustomSettings.Views.Items.CustomSettingsDeploymentStep.Fields.Summary"
 msgid "No custom settings selected."
diff --git a/Localization/zh-Hant/OrchardCore.Data.YesSql.po b/Localization/zh-Hant/OrchardCore.Data.YesSql.po
index d3863494c447a..2eb3712b585a7 100644
--- a/Localization/zh-Hant/OrchardCore.Data.YesSql.po
+++ b/Localization/zh-Hant/OrchardCore.Data.YesSql.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ErrorMessage = S["Failed to remove the tables."];
-#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:101
+#: OrchardCore.Data.YesSql\Removing\ShellDbTablesRemovingHandler.cs:108
 msgctxt "OrchardCore.Environment.Shell.Removing.ShellDbTablesRemovingHandler"
 msgid "Failed to remove the tables."
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Demo.po b/Localization/zh-Hant/OrchardCore.Demo.po
index 7c0565cee7dda..d53cea53cd7a9 100644
--- a/Localization/zh-Hant/OrchardCore.Demo.po
+++ b/Localization/zh-Hant/OrchardCore.Demo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:51\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Demo"], "10", demo => demo
 #: OrchardCore.Demo\AdminMenu.cs:25
@@ -118,7 +118,7 @@ msgctxt "OrchardCore.Demo.Pages.OutsideAdmin"
 msgid "MMMM dd, yyyy"
 msgstr ""
 
-#. <label asp-for="FirstName">@T["First Name"]</label>
+#. <label asp-for="FirstName" class="form-label">@T["First Name"]</label>
 #. <input asp-for="FirstName" type="text" class="form-control" placeholder="@T["First Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:4
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:5
@@ -126,7 +126,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "First Name"
 msgstr ""
 
-#. <label asp-for="LastName">@T["Last Name"]</label>
+#. <label asp-for="LastName" class="form-label">@T["Last Name"]</label>
 #. <input asp-for="LastName" type="text" class="form-control" placeholder="@T["Last Name"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:9
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:10
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Demo.Views.UserProfile.Edit"
 msgid "Last Name"
 msgstr ""
 
-#. <label asp-for="Age">@T["Age"]</label>
+#. <label asp-for="Age" class="form-label">@T["Age"]</label>
 #. <input asp-for="Age" type="text" class="form-control" placeholder="@T["Age"]" />
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:14
 #: OrchardCore.Demo\Views\UserProfile.Edit.cshtml:15
diff --git a/Localization/zh-Hant/OrchardCore.Deployment.Remote.po b/Localization/zh-Hant/OrchardCore.Deployment.Remote.po
index c2b29c104a607..7a0582c36bcc5 100644
--- a/Localization/zh-Hant/OrchardCore.Deployment.Remote.po
+++ b/Localization/zh-Hant/OrchardCore.Deployment.Remote.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:28\n"
+"PO-Revision-Date: 2023-12-22 16:15\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment.Remote\AdminMenu.cs:25
@@ -160,13 +160,13 @@ msgctxt "OrchardCore.Deployment.RemoteInstanceDeploymentTargetProvider"
 msgid "Sends the deployment plan to a remote instance."
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:7
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Create.cshtml:13
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Create"
 msgid "Api Key"
@@ -190,25 +190,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Create Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:14
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:20
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Create.cshtml:26
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Create"
 msgid "Api Key"
@@ -232,13 +232,13 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Edit Remote Client"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteClient\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteClient.Edit"
 msgid "Api Key"
@@ -262,25 +262,25 @@ msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Edit Remote Instance"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:10
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url">@T["Url"]</label>
+#. <label asp-for="Url" class="form-label">@T["Url"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:16
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="ClientName">@T["Client Name"]</label>
+#. <label asp-for="ClientName" class="form-label">@T["Client Name"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:22
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Client Name"
 msgstr ""
 
-#. <label asp-for="ApiKey">@T["Api Key"]</label>
+#. <label asp-for="ApiKey" class="form-label">@T["Api Key"]</label>
 #: OrchardCore.Deployment.Remote\Views\RemoteInstance\Edit.cshtml:28
 msgctxt "OrchardCore.Deployment.Remote.Views.RemoteInstance.Edit"
 msgid "Api Key"
diff --git a/Localization/zh-Hant/OrchardCore.Deployment.po b/Localization/zh-Hant/OrchardCore.Deployment.po
index d8db08adf6bb1..baa7fea09fc37 100644
--- a/Localization/zh-Hant/OrchardCore.Deployment.po
+++ b/Localization/zh-Hant/OrchardCore.Deployment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:29\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Deployment\AdminMenu.cs:25
@@ -51,41 +51,41 @@ msgid "JSON Import"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Delete) }
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:106
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:105
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:142
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:141
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plans successfully deleted."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
 #. ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:217
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:282
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:216
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:281
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "The name is mandatory."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
 #. ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:223
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:289
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:222
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:288
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "A deployment plan with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:300
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:299
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
-#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:326
+#: OrchardCore.Deployment\Controllers\DeploymentPlanController.cs:325
 msgctxt "OrchardCore.Deployment.Controllers.DeploymentPlanController"
 msgid "Deployment plan deleted successfully."
 msgstr ""
@@ -174,7 +174,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Create Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Create.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Create"
 msgid "Name"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The custom file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="FileName">@T["File Name"]</label>
+#. <label asp-for="FileName" class="form-label">@T["File Name"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Name"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit
 msgid "The filename as it will be added in the archive."
 msgstr ""
 
-#. <label asp-for="FileContent">@T["File Content"]</label>
+#. <label asp-for="FileContent" class="form-label">@T["File Content"]</label>
 #: OrchardCore.Deployment\Views\Items\CustomFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.CustomFileDeploymentStep.Fields.Edit"
 msgid "File Content"
@@ -288,13 +288,13 @@ msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.
 msgid "Deployment Plans"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No deployment plan selected."]</span>
+#. <span class="badge text-bg-warning">@T["No deployment plan selected."]</span>
 #: OrchardCore.Deployment\Views\Items\DeploymentPlanDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Deployment.Views.Items.DeploymentPlanDeploymentStep.Fields.Summary"
 msgid "No deployment plan selected."
@@ -400,7 +400,7 @@ msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Edit Deployment Plan"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Deployment\Views\DeploymentPlan\Edit.cshtml:9
 msgctxt "OrchardCore.Deployment.Views.DeploymentPlan.Edit"
 msgid "Name"
@@ -572,7 +572,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit
 msgid "JSON Recipe"
 msgstr ""
 
-#. <label asp-for="Json">@T["Recipe"]</label>
+#. <label asp-for="Json" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Deployment\Views\Items\JsonRecipeDeploymentStep.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Deployment.Views.Items.JsonRecipeDeploymentStep.Fields.Edit"
 msgid "Recipe"
@@ -614,7 +614,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe file to add as part of the plan."
 msgstr ""
 
-#. <label asp-for="RecipeName">@T["Recipe Name"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Recipe Name"
@@ -626,7 +626,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe name."
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Display Name"
@@ -638,7 +638,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe display name."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Description"
@@ -650,7 +650,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe description."
 msgstr ""
 
-#. <label asp-for="Author">@T["Author"]</label>
+#. <label asp-for="Author" class="form-label">@T["Author"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Author"
@@ -662,7 +662,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe author."
 msgstr ""
 
-#. <label asp-for="WebSite">@T["WebSite"]</label>
+#. <label asp-for="WebSite" class="form-label">@T["WebSite"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:43
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "WebSite"
@@ -674,7 +674,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe web site."
 msgstr ""
 
-#. <label asp-for="Version">@T["Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Version"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:49
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Version"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe version."
 msgstr ""
 
-#. <label asp-for="Categories">@T["Categories"]</label>
+#. <label asp-for="Categories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:57
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Categories"
@@ -698,7 +698,7 @@ msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit
 msgid "The recipe categories (comma separated values)."
 msgstr ""
 
-#. <label asp-for="Tags">@T["Tags"]</label>
+#. <label asp-for="Tags" class="form-label">@T["Tags"]</label>
 #: OrchardCore.Deployment\Views\Items\RecipeFileDeploymentStep.Fields.Edit.cshtml:63
 msgctxt "OrchardCore.Deployment.Views.Items.RecipeFileDeploymentStep.Fields.Edit"
 msgid "Tags"
diff --git a/Localization/zh-Hant/OrchardCore.Diagnostics.po b/Localization/zh-Hant/OrchardCore.Diagnostics.po
index 0ae97e52dd9ca..150ae5f0810e4 100644
--- a/Localization/zh-Hant/OrchardCore.Diagnostics.po
+++ b/Localization/zh-Hant/OrchardCore.Diagnostics.po
@@ -10,35 +10,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:08\n"
+"PO-Revision-Date: 2023-12-22 16:16\n"
 
 #. <h1>@T["Your browser sent a request that this server could not understand."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\BadRequest.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.BadRequest"
+#: OrchardCore.Diagnostics\Views\HttpError-BadRequest.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-BadRequest"
 msgid "Your browser sent a request that this server could not understand."
 msgstr ""
 
-#. <h1>@T["An error occurred while executing this request."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Error.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Error"
-msgid "An error occurred while executing this request."
-msgstr ""
-
 #. <h1>@T["You do not have access to this resource."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Forbidden.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Forbidden"
+#: OrchardCore.Diagnostics\Views\HttpError-Forbidden.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Forbidden"
 msgid "You do not have access to this resource."
 msgstr ""
 
 #. <h1>@T["The page could not be found."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\NotFound.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.NotFound"
+#: OrchardCore.Diagnostics\Views\HttpError-NotFound.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-NotFound"
 msgid "The page could not be found."
 msgstr ""
 
 #. <h1>@T["You are not authorized to view this content."]</h1>
-#: OrchardCore.Diagnostics\Views\Diagnostics\Unauthorized.cshtml:1
-msgctxt "OrchardCore.Diagnostics.Views.Diagnostics.Unauthorized"
+#: OrchardCore.Diagnostics\Views\HttpError-Unauthorized.cshtml:1
+msgctxt "OrchardCore.Diagnostics.Views.HttpError-Unauthorized"
 msgid "You are not authorized to view this content."
 msgstr ""
 
+#. <h1>@T["An error occurred while executing this request."]</h1>
+#: OrchardCore.Diagnostics\Views\HttpError.cshtml:3
+msgctxt "OrchardCore.Diagnostics.Views.HttpError"
+msgid "An error occurred while executing this request."
+msgstr ""
+
diff --git a/Localization/zh-Hant/OrchardCore.Email.Abstractions.po b/Localization/zh-Hant/OrchardCore.Email.Abstractions.po
index 25f2e09757366..b6ab5d0cc1dd8 100644
--- a/Localization/zh-Hant/OrchardCore.Email.Abstractions.po
+++ b/Localization/zh-Hant/OrchardCore.Email.Abstractions.po
@@ -10,18 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:09\n"
+"PO-Revision-Date: 2023-12-22 16:17\n"
 
 #. yield return new ValidationResult(S["The {0} field is required.", "Host name"], new[] { nameof(Host) });
 #. yield return new ValidationResult(S["The {0} field is required.", "Pickup directory location"], new[] { nameof(PickupDirectoryLocation) });
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:92
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:98
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:97
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:103
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The {0} field is required."
 msgstr "{0} 字段是必需的。"
 
 #. throw new NotSupportedException(S["The '{0}' delivery method is not supported.", DeliveryMethod]);
-#: OrchardCore.Email.Abstractions\SmtpSettings.cs:102
+#: OrchardCore.Email.Abstractions\SmtpSettings.cs:107
 msgctxt "OrchardCore.Email.SmtpSettings"
 msgid "The '{0}' delivery method is not supported."
 msgstr "不支持 '{0}''执行方式。"
diff --git a/Localization/zh-Hant/OrchardCore.Email.po b/Localization/zh-Hant/OrchardCore.Email.po
index 6549fb74b3ec5..fa65bbd4a2216 100644
--- a/Localization/zh-Hant/OrchardCore.Email.po
+++ b/Localization/zh-Hant/OrchardCore.Email.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:54\n"
+"PO-Revision-Date: 2023-12-22 16:18\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Email\AdminMenu.cs:24
@@ -45,25 +45,25 @@ msgid "Invalid Email."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Email Task"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:32
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Email Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Messaging"];
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:35
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:34
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Messaging"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:95
+#: OrchardCore.Email\Workflows\Activities\EmailTask.cs:94
 msgctxt "OrchardCore.Email.Workflows.Activities.EmailTask"
 msgid "Failed"
 msgstr ""
@@ -74,7 +74,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Design"
 msgid "Send Email"
 msgstr ""
 
-#. <label asp-for="AuthorExpression">@T["From"]</label>
+#. <label asp-for="AuthorExpression" class="form-label">@T["From"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "From"
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The author's email address that defines who the email is from. Leave blank to use the configured email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["Sender"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Sender"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The sender's email address. Required if not the same than the \"From\" email address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SenderExpression">@T["ReplyTo"]</label>
+#. <label asp-for="SenderExpression" class="form-label">@T["ReplyTo"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "ReplyTo"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The \"reply to\" email address. Required if you want email replies be sent to a different address than the \"From\" address. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RecipientsExpression">@T["Recipients"]</label>
+#. <label asp-for="RecipientsExpression" class="form-label">@T["Recipients"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Recipients"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of recipient email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="CcExpression">@T["Cc"]</label>
+#. <label asp-for="CcExpression" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Cc"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of carbon copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="BccExpression">@T["Bcc"]</label>
+#. <label asp-for="BccExpression" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Bcc"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "The comma-separated list of blind copy email addresses. With Liquid support."
 msgstr ""
 
-#. <label asp-for="SubjectExpression">@T["Subject"]</label>
+#. <label asp-for="SubjectExpression" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:47
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Subject"
@@ -170,7 +170,7 @@ msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "If checked, indicates the body of the email message will be sent as HTML."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Items\EmailTask.Fields.Edit.cshtml:62
 msgctxt "OrchardCore.Email.Views.Items.EmailTask.Fields.Edit"
 msgid "Body"
@@ -200,13 +200,13 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Settings"
 msgstr "設定"
 
-#. <label asp-for="To">@T["To"]</label>
+#. <label asp-for="To" class="form-label">@T["To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:10
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "To"
 msgstr ""
 
-#. <label asp-for="Sender">@T["Sender"]</label>
+#. <label asp-for="Sender" class="form-label">@T["Sender"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Sender"
@@ -218,37 +218,37 @@ msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "The sender is optional, it is useful when the email author is different than the email submitter."
 msgstr ""
 
-#. <label asp-for="Bcc">@T["Bcc"]</label>
+#. <label asp-for="Bcc" class="form-label">@T["Bcc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:25
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Bcc"
 msgstr ""
 
-#. <label asp-for="Cc">@T["Cc"]</label>
+#. <label asp-for="Cc" class="form-label">@T["Cc"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:32
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Cc"
 msgstr ""
 
-#. <label asp-for="ReplyTo">@T["Reply To"]</label>
+#. <label asp-for="ReplyTo" class="form-label">@T["Reply To"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:39
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Reply To"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:46
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Subject"
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:53
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Body"
 msgstr ""
 
-#. <button type="submit" id="emailtestsend" class="button grey">@T["Send"]</button>
+#. <button type="submit" id="emailtestsend" class="btn btn-primary">@T["Send"]</button>
 #: OrchardCore.Email\Views\Admin\Index.cshtml:59
 msgctxt "OrchardCore.Email.Views.Admin.Index"
 msgid "Send"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="DefaultSender">@T["Sender email address"]</label>
+#. <label asp-for="DefaultSender" class="form-label">@T["Sender email address"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:7
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Sender email address"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The default email address to use as a sender, unless the email sender is set."
 msgstr ""
 
-#. <label asp-for="DeliveryMethod">@T["Delivery method"]</label>
+#. <label asp-for="DeliveryMethod" class="form-label">@T["Delivery method"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Delivery method"
@@ -308,7 +308,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Network delivery options"
 msgstr ""
 
-#. <label asp-for="Host">@T["Host name"]</label>
+#. <label asp-for="Host" class="form-label">@T["Host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Host name"
@@ -320,7 +320,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server domain, e.g. <i>smtp.mailprovider.com</i>."
 msgstr ""
 
-#. <label asp-for="Port">@T["Port number"]</label>
+#. <label asp-for="Port" class="form-label">@T["Port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Port number"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The SMTP server port, usually 25."
 msgstr ""
 
-#. <label asp-for="ProxyHost">@T["Proxy host name"]</label>
+#. <label asp-for="ProxyHost" class="form-label">@T["Proxy host name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:61
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy host name"
@@ -344,7 +344,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy server is optional."
 msgstr ""
 
-#. <label asp-for="ProxyPort">@T["Proxy port number"]</label>
+#. <label asp-for="ProxyPort" class="form-label">@T["Proxy port number"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:71
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Proxy port number"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The proxy port is optional."
 msgstr ""
 
-#. <label asp-for="EncryptionMethod">@T["Encryption method to use"]</label>
+#. <label asp-for="EncryptionMethod" class="form-label">@T["Encryption method to use"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:81
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Encryption method to use"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "When this option is selected, the application pool or host-process identity is used to authenticate with the mail server."
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:120
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "User name"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "The username for authentication."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:127
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Password"
@@ -464,7 +464,7 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Specified pickup directory delivery options"
 msgstr ""
 
-#. <label asp-for="PickupDirectoryLocation">@T["Pickup directory location"]</label>
+#. <label asp-for="PickupDirectoryLocation" class="form-label">@T["Pickup directory location"]</label>
 #: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:144
 msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "Pickup directory location"
@@ -476,6 +476,18 @@ msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
 msgid "E.g. <i>C:\\Path\\To\\This\\Site\\PickedUpEmail</i> to place emails in a <i>PickedUpEmail</i> directory on the C drive."
 msgstr ""
 
+#. <label class="form-check-label" asp-for="IgnoreInvalidSslCertificate">@T["Ignore Invalid SSL Certificate"]</label>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:157
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignore Invalid SSL Certificate"
+msgstr ""
+
+#. <span class="hint dashed">@T["Ignores SSL certificate check if it's invalid."]</span>
+#: OrchardCore.Email\Views\SmtpSettings.Edit.cshtml:158
+msgctxt "OrchardCore.Email.Views.SmtpSettings.Edit"
+msgid "Ignores SSL certificate check if it's invalid."
+msgstr ""
+
 #. <a href="@Url.Action("Index", "Admin", new { area = "OrchardCore.Email" })" class="btn btn-secondary">@T["Test settings"]</a>
 #: OrchardCore.Email\Views\SmtpSettings.TestButton.cshtml:1
 msgctxt "OrchardCore.Email.Views.SmtpSettings.TestButton"
diff --git a/Localization/zh-Hant/OrchardCore.Facebook.po b/Localization/zh-Hant/OrchardCore.Facebook.po
index 46644c2386bb2..bb28d80d166f4 100644
--- a/Localization/zh-Hant/OrchardCore.Facebook.po
+++ b/Localization/zh-Hant/OrchardCore.Facebook.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:31\n"
+"PO-Revision-Date: 2023-12-22 16:19\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Facebook\AdminMenu.cs:26
@@ -97,7 +97,7 @@ msgid "The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:41
+#: OrchardCore.Facebook\Widgets\Settings\FacebookPluginPartSettingsDisplayDriver.cs:42
 msgctxt "OrchardCore.Facebook.Widgets.Settings.FacebookPluginPartSettingsDisplayDriver"
 msgid "The Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
@@ -150,7 +150,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Login Settings"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "CallbackPath"
@@ -162,7 +162,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="SaveTokens">@T["Store tokens"]</label>
+#. <label class="form-check-label" class="form-label" asp-for="SaveTokens">@T["Store tokens"]</label>
 #: OrchardCore.Facebook\Views\FacebookLoginSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "Store tokens"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookLoginSettings.Edit"
 msgid "<a href=\"{0}\">Meta Integration settings</a> must be configured in order to use the Login Feature"
 msgstr ""
 
-#. <label>@T["Pixel Identifier"]</label>
+#. <label asp-for="PixelId" class="form-label">@T["Pixel Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookPixelSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "Pixel Identifier"
@@ -192,7 +192,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPixelSettings.Edit"
 msgid "The Pixel ID found on the Meta Data Sources portal."
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPart.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "Body"
@@ -204,7 +204,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookPluginPart.Edit"
 msgid "The template of the plugin, in Liquid format."
 msgstr ""
 
-#. <label asp-for="Liquid">@T["Body"]</label>
+#. <label asp-for="Liquid" class="form-label">@T["Body"]</label>
 #: OrchardCore.Facebook\Views\FacebookPluginPartSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Facebook.Views.FacebookPluginPartSettings.Edit"
 msgid "Body"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Meta Integration"
 msgstr ""
 
-#. <label>@T["Application Identifier"]</label>
+#. <label asp-for="AppId" class="form-label">@T["Application Identifier"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Application Identifier"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application ID found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Secret Key"
@@ -264,13 +264,13 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "The Application secret key found on the Meta developer portal parameters."
 msgstr ""
 
-#. <label>@T["Javascript SDK Version"]</label>
+#. <label asp-for="Version" class="form-label">@T["Javascript SDK Version"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript SDK Version"
 msgstr ""
 
-#. <label>@T["Javascript Sdk js"]</label>
+#. <label asp-for="SdkJs" class="form-label">@T["Javascript Sdk js"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Javascript Sdk js"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Init on every page"
 msgstr ""
 
-#. <label>@T["Parameters for the FB.init() call"]</label>
+#. <label asp-for="FBInitParams" class="form-label">@T["Parameters for the FB.init() call"]</label>
 #: OrchardCore.Facebook\Views\FacebookSettings.Edit.cshtml:59
 msgctxt "OrchardCore.Facebook.Views.FacebookSettings.Edit"
 msgid "Parameters for the FB.init() call"
diff --git a/Localization/zh-Hant/OrchardCore.Features.po b/Localization/zh-Hant/OrchardCore.Features.po
index ff2cd71eb3965..4032224cb8dab 100644
--- a/Localization/zh-Hant/OrchardCore.Features.po
+++ b/Localization/zh-Hant/OrchardCore.Features.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Features\AdminMenu.cs:25
@@ -27,19 +27,19 @@ msgid "Features"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:91
+#: OrchardCore.Features\Controllers\AdminController.cs:92
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "Please select one or more features."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
-#: OrchardCore.Features\Controllers\AdminController.cs:130
+#: OrchardCore.Features\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "This feature is always enabled and cannot be disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-#: OrchardCore.Features\Controllers\AdminController.cs:237
+#: OrchardCore.Features\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Features.Controllers.AdminController"
 msgid "{0} was {1}."
 msgstr ""
@@ -125,9 +125,9 @@ msgstr "批次操作"
 #. <button class="btn btn-danger btn-sm" disabled>@T["Disable"]</button>
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:32
-#: OrchardCore.Features\Views\Admin\Features.cshtml:130
-#: OrchardCore.Features\Views\Admin\Features.cshtml:143
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:148
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable"
 msgstr ""
@@ -136,8 +136,8 @@ msgstr ""
 #. <button class="btn btn-primary btn-sm" disabled>@T["Enable"]</button>
 #. <a id="btn-enable-@Html.GenerateIdFromName(featureId)" asp-action="Enable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Enable"]</a>
 #: OrchardCore.Features\Views\Admin\Features.cshtml:33
-#: OrchardCore.Features\Views\Admin\Features.cshtml:136
-#: OrchardCore.Features\Views\Admin\Features.cshtml:150
+#: OrchardCore.Features\Views\Admin\Features.cshtml:141
+#: OrchardCore.Features\Views\Admin\Features.cshtml:155
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Enable"
 msgstr ""
@@ -154,19 +154,19 @@ msgid "Uncategorized"
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically enabled based on dependency and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:129
+#: OrchardCore.Features\Views\Admin\Features.cshtml:134
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically enabled based on dependency and cannot be manually disabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is automatically disabled based on dependency and cannot be manually enabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:135
+#: OrchardCore.Features\Views\Admin\Features.cshtml:140
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is automatically disabled based on dependency and cannot be manually enabled."
 msgstr ""
 
 #. <div data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="@T["This feature is always enabled and cannot be manually disabled."]">
-#: OrchardCore.Features\Views\Admin\Features.cshtml:142
+#: OrchardCore.Features\Views\Admin\Features.cshtml:147
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "This feature is always enabled and cannot be manually disabled."
 msgstr ""
@@ -182,25 +182,25 @@ msgid "Disabling the {0} feature will also disable the following dependent featu
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Disable Feature"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "Yes"
 msgstr ""
 
 #. <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
-#: OrchardCore.Features\Views\Admin\Features.cshtml:160
+#: OrchardCore.Features\Views\Admin\Features.cshtml:165
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "No"
 msgstr ""
 
 #. @T["<strong>Nothing here!</strong> Your search returned no results."]
-#: OrchardCore.Features\Views\Admin\Features.cshtml:172
+#: OrchardCore.Features\Views\Admin\Features.cshtml:177
 msgctxt "OrchardCore.Features.Views.Admin.Features"
 msgid "<strong>Nothing here!</strong> Your search returned no results."
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Flows.po b/Localization/zh-Hant/OrchardCore.Flows.po
index f407ed1791bc6..d52c64ca9013c 100644
--- a/Localization/zh-Hant/OrchardCore.Flows.po
+++ b/Localization/zh-Hant/OrchardCore.Flows.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 15:56\n"
+"PO-Revision-Date: 2023-12-22 16:20\n"
 
 #. await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:193
+#: OrchardCore.Flows\Drivers\BagPartDisplayDriver.cs:187
 msgctxt "OrchardCore.Flows.Drivers.BagPartDisplayDriver"
 msgid "The Widget content item with id {0} has no matching {1} content type definition."
 msgstr ""
@@ -72,14 +72,14 @@ msgctxt "OrchardCore.Flows.Views.BagPart.Edit"
 msgid "Add Item"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\BagPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.BagPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Source">@T["Contained Content Types"]</label>
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="Source" class="form-label">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:5
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The content types that this bag can contain, e.g. Slide for a Slide Show."
 msgstr ""
 
-#. <label asp-for="Stereotypes">@T["Stereotypes"]</label>
+#. <label asp-for="Stereotypes" class="form-label">@T["Stereotypes"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Stereotypes"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "The Stereotypes of the content types that this bag can contain. You may define multiple Stereotypes using the comma (,) as a separator"
 msgstr ""
 
-#. <label asp-for="DisplayType">@T["Display Type"]</label>
+#. <label asp-for="DisplayType" class="form-label">@T["Display Type"]</label>
 #: OrchardCore.Flows\Views\BagPartSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Flows.Views.BagPartSettings.Edit"
 msgid "Display Type"
@@ -171,13 +171,13 @@ msgid "Insert Widget"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Delete"
 msgstr ""
 
 #. <button type="button" class="btn btn-danger widget-delete" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this item?"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
-#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:62
+#: OrchardCore.Flows\Views\ContentCard-FlowPart.Edit.cshtml:64
 msgctxt "OrchardCore.Flows.Views.ContentCard-FlowPart.Edit"
 msgid "Are you sure you want to remove this item?"
 msgstr ""
@@ -254,13 +254,13 @@ msgctxt "OrchardCore.Flows.Views.FlowPart.Edit"
 msgid "No widgets found."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Flows\Views\FlowPart.Option.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Restrict Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Restrict Content Types"]</label>
 #: OrchardCore.Flows\Views\FlowPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Flows.Views.FlowPartSettings.Edit"
 msgid "Restrict Content Types"
diff --git a/Localization/zh-Hant/OrchardCore.Forms.po b/Localization/zh-Hant/OrchardCore.Forms.po
index a0d4394297905..d054b5ffc1956 100644
--- a/Localization/zh-Hant/OrchardCore.Forms.po
+++ b/Localization/zh-Hant/OrchardCore.Forms.po
@@ -10,7 +10,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
+
+#. public override LocalizedString DisplayText => S["Http Redirect To Form Location Task"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:26
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Http Redirect To Form Location Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["HTTP"];
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:28
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "HTTP"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Forms\Activities\HttpRedirectToFormLocationTask.cs:31
+msgctxt "OrchardCore.Forms.Activities.HttpRedirectToFormLocationTask"
+msgid "Failed"
+msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
 #: OrchardCore.Forms\Drivers\FormInputElementPartDisplayDriver.cs:38
@@ -25,121 +49,121 @@ msgid "The options are written in an incorrect format."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Add Model Validation Error Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:45
+#: OrchardCore.Forms\Workflows\Activities\AddModelValidationErrorTask.cs:43
 msgctxt "OrchardCore.Forms.Workflows.Activities.AddModelValidationErrorTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Bind Model State Task"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Bind Model State Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:37
+#: OrchardCore.Forms\Workflows\Activities\BindModelStateTask.cs:35
 msgctxt "OrchardCore.Forms.Workflows.Activities.BindModelStateTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:29
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validate Antiforgery Token Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:31
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:39
+#: OrchardCore.Forms\Workflows\Activities\ValidateAntiforgeryTokenTask.cs:37
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateAntiforgeryTokenTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Field Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:31
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:30
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validate Form Field Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:33
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:32
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:49
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormFieldTask.cs:48
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormFieldTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate Form Task"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:25
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validate Form Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:29
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:27
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Valid"], S["Invalid"]);
-#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:35
+#: OrchardCore.Forms\Workflows\Activities\ValidateFormTask.cs:33
 msgctxt "OrchardCore.Forms.Workflows.Activities.ValidateFormTask"
 msgid "Invalid"
 msgstr ""
@@ -156,7 +180,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Design
 msgid "<em>{0}</em>: <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
+#. <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Key"
@@ -168,7 +192,7 @@ msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "The name of the form field that has an invalid value."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\AddModelValidationErrorTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.AddModelValidationErrorTask.Fields.Edit"
 msgid "Error Message"
@@ -210,7 +234,7 @@ msgctxt "OrchardCore.Forms.Views.Items.BindModelStateTask.Fields.Thumbnail"
 msgid "Binds submitted form fields to the model state."
 msgstr ""
 
-#. <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
+#. <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Text"
@@ -222,7 +246,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The text to display on the button."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\ButtonPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "Type"
@@ -234,7 +258,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ButtonPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
+#. <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label option"
@@ -264,7 +288,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The type of label to create for this field."
 msgstr ""
 
-#. <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
+#. <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementLabelPart.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "Label Text"
@@ -276,7 +300,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementLabelPart.Fields.Edit"
 msgid "The text to display in the label."
 msgstr ""
 
-#. <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
+#. <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "ID"
@@ -288,7 +312,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementPart.Fields.Edit"
 msgid "The ID to render on this form element."
 msgstr ""
 
-#. <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
+#. <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
 #: OrchardCore.Forms\Views\Items\FormElementValidationPart.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "Validation option"
@@ -312,7 +336,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormElementValidationPart.Fields.Edit"
 msgid "The type of validation to create for this field."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Forms\Views\Items\FormInputElementPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "Name"
@@ -324,7 +348,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormInputElementPart.Fields.Edit"
 msgid "The name to render on this form element."
 msgstr ""
 
-#. <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
+#. <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Action"
@@ -336,7 +360,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The URL to submit the form to."
 msgstr ""
 
-#. <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
+#. <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Method"
@@ -348,7 +372,7 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "The HTTP method to use when submitting the form."
 msgstr ""
 
-#. <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
+#. <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
 #: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "EncType"
@@ -372,7 +396,49 @@ msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
 msgid "Check to generate an Anti Forgery Token in the form."
 msgstr ""
 
-#. <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
+#. <label asp-for="SaveFormLocation" class="form-check-label">@T["Save Form Location"]</label>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:50
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Save Form Location"
+msgstr ""
+
+#. <span class="hint">@T["Check in order to store the current form location. This stored location can later be used to return the user to their initial location."]</span>
+#: OrchardCore.Forms\Views\Items\FormPart.Fields.Edit.cshtml:51
+msgctxt "OrchardCore.Forms.Views.Items.FormPart.Fields.Edit"
+msgid "Check in order to store the current form location. This stored location can later be used to return the user to their initial location."
+msgstr ""
+
+#. <h4><i class="fa-solid fa-globe" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["HTTP Redirect To Form Location"])</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Design.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Design"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "Form Location Key"
+msgstr ""
+
+#. <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Edit"
+msgid "This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa-solid fa-globe" aria-hidden="true"></i>@T["HTTP Redirect To Form Location"]</h4>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "HTTP Redirect To Form Location"
+msgstr ""
+
+#. <p>@T["Redirect the user agent to the original location of the form."]</p>
+#: OrchardCore.Forms\Views\Items\HttpRedirectToFormLocationTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Forms.Views.Items.HttpRedirectToFormLocationTask.Fields.Thumbnail"
+msgid "Redirect the user agent to the original location of the form."
+msgstr ""
+
+#. <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Type"
@@ -510,7 +576,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The button type."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -522,7 +588,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The text to display when the field has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\InputPart.Fields.Edit.cshtml:46
 msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "Default Value"
@@ -534,7 +600,7 @@ msgctxt "OrchardCore.Forms.Views.Items.InputPart.Fields.Edit"
 msgid "The default value for this field."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\LabelPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.LabelPart.Fields.Edit"
 msgid "For"
@@ -602,8 +668,8 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="select-options-textarea">@T["Options"]</label>
-#. <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+#. <label for="select-options-textarea" class="form-label">@T["Options"]</label>
+#. <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:79
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:122
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
@@ -616,7 +682,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
-#. <label for="options-default-value">@T["Default value"]</label>
+#. <label for="options-default-value" class="form-label">@T["Default value"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:86
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Default value"
@@ -640,7 +706,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
+#. <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
 #: OrchardCore.Forms\Views\Items\SelectPart.Fields.Edit.cshtml:110
 msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "Editor"
@@ -670,7 +736,7 @@ msgctxt "OrchardCore.Forms.Views.Items.SelectPart.Fields.Edit"
 msgid "The editor style to use for this field."
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Placeholder Text"
@@ -682,7 +748,7 @@ msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "The text to display when the textarea has no value."
 msgstr ""
 
-#. <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
+#. <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
 #: OrchardCore.Forms\Views\Items\TextAreaPart.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Forms.Views.Items.TextAreaPart.Fields.Edit"
 msgid "Default Value"
@@ -724,7 +790,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Design"
 msgid "Validate <em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
+#. <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Field Name"
@@ -736,7 +802,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "The name of the form field to validate."
 msgstr ""
 
-#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
+#. <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
 #: OrchardCore.Forms\Views\Items\ValidateFormFieldTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Forms.Views.Items.ValidateFormFieldTask.Fields.Edit"
 msgid "Error Message"
@@ -778,7 +844,7 @@ msgctxt "OrchardCore.Forms.Views.Items.ValidateFormTask.Fields.Thumbnail"
 msgid "Checks whether the submitted form contains any validation errors."
 msgstr ""
 
-#. <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
+#. <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
 #: OrchardCore.Forms\Views\Items\ValidationPart.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Forms.Views.Items.ValidationPart.Fields.Edit"
 msgid "For"
diff --git a/Localization/zh-Hant/OrchardCore.GitHub.po b/Localization/zh-Hant/OrchardCore.GitHub.po
index 067e6b4314e00..a1cbb54a291cd 100644
--- a/Localization/zh-Hant/OrchardCore.GitHub.po
+++ b/Localization/zh-Hant/OrchardCore.GitHub.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:21\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.GitHub\AdminMenuGitHubLogin.cs:23
@@ -86,7 +86,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "GitHub Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The Client ID defined in the general tab of your <a target=\"_blank\" href=\"https://github.com/settings/apps\">GitHub App</a>."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client secret"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "Client secret"
@@ -110,7 +110,7 @@ msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "The secret for your app."
 msgstr ""
 
-#. <label asp-for="CallbackUrl">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackUrl" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.GitHub\Views\GithubAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.GitHub.Views.GithubAuthenticationSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/zh-Hant/OrchardCore.Google.po b/Localization/zh-Hant/OrchardCore.Google.po
index d61bc8b05ed1f..b7f26761bdaa2 100644
--- a/Localization/zh-Hant/OrchardCore.Google.po
+++ b/Localization/zh-Hant/OrchardCore.Google.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
 #. results.Add(new ValidationResult(S["The Client ID is required."], new[]
 #: OrchardCore.Google\Authentication\Services\GoogleAuthenticationService.cs:66
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Google Analytics Settings"
 msgstr ""
 
-#. <label asp-for="TrackingID">@T["Tracking ID"]</label>
+#. <label asp-for="TrackingID" class="form-label">@T["Tracking ID"]</label>
 #: OrchardCore.Google\Views\GoogleAnalyticsSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleAnalyticsSettings.Edit"
 msgid "Tracking ID"
@@ -216,7 +216,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Google Authentication Settings"
 msgstr ""
 
-#. <label asp-for="ClientID">@T["Client ID"]</label>
+#. <label asp-for="ClientID" class="form-label">@T["Client ID"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "Client ID"
@@ -228,7 +228,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client id defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["API secret key"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["API secret key"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "API secret key"
@@ -240,7 +240,7 @@ msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "The client secret defined in Google API console for the application."
 msgstr ""
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Google\Views\GoogleAuthenticationSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Google.Views.GoogleAuthenticationSettings.Edit"
 msgid "CallbackPath"
@@ -276,7 +276,7 @@ msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Google Tag Manager Settings"
 msgstr ""
 
-#. <label asp-for="ContainerID">@T["Container ID"]</label>
+#. <label asp-for="ContainerID" class="form-label">@T["Container ID"]</label>
 #: OrchardCore.Google\Views\GoogleTagManagerSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Google.Views.GoogleTagManagerSettings.Edit"
 msgid "Container ID"
diff --git a/Localization/zh-Hant/OrchardCore.Html.po b/Localization/zh-Hant/OrchardCore.Html.po
index 3e8c7268f60d1..51cad4f9f7bf5 100644
--- a/Localization/zh-Hant/OrchardCore.Html.po
+++ b/Localization/zh-Hant/OrchardCore.Html.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:22\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Html\Drivers\HtmlBodyPartDisplayDriver.cs:73
 msgctxt "OrchardCore.Html.Drivers.HtmlBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
@@ -78,7 +78,7 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.DisplayOption"
 msgid "Standard"
@@ -90,20 +90,20 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Edit"
 msgid "The body of the content item."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Html\Views\HtmlBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Html.Views.HtmlBodyPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options, language is always set to `html` when saved."]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:9
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options, language is always set to `html` when saved."]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Enter the editor options, language is always set to `html` when saved."
 msgstr ""
 
-#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:11
+#. <span class="hint"><a href="https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IStandaloneEditorConstructionOptions.html" target="_blank">@T["Documentation for options"]</a></span>
+#: OrchardCore.Html\Views\HtmlBodyPartMonacoSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartMonacoSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
@@ -138,14 +138,14 @@ msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Whether the url is used when selected from Insert Media (By default, the Shortcode is inserted)."
 msgstr ""
 
-#. <label asp-for="Options">@T["Enter the editor options"]</label>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
+#. <label asp-for="Options" class="form-label">@T["Enter the editor options"]</label>
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Enter the editor options"
 msgstr ""
 
 #. <span class="hint"><a href="https://alex-d.github.io/Trumbowyg/documentation/#button-pane" target="_blank">@T["Documentation for options"]</a></span>
-#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:13
+#: OrchardCore.Html\Views\HtmlBodyPartTrumbowygSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Html.Views.HtmlBodyPartTrumbowygSettings.Edit"
 msgid "Documentation for options"
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Https.po b/Localization/zh-Hant/OrchardCore.Https.po
index d52efc95e220c..db36cc9ec9f04 100644
--- a/Localization/zh-Hant/OrchardCore.Https.po
+++ b/Localization/zh-Hant/OrchardCore.Https.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-17 16:46\n"
+"PO-Revision-Date: 2023-12-22 16:23\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.Https\AdminMenu.cs:25
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "Specifies whether a permanent redirect, 308 Moved Permanently, should be used instead of a temporary redirect, 307 Found, when redirecting to HTTPS"
 msgstr ""
 
-#. <label asp-for="SslPort">@T["SSL Port"]</label>
+#. <label asp-for="SslPort" class="form-label">@T["SSL Port"]</label>
 #: OrchardCore.Https\Views\HttpsSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Https.Views.HttpsSettings.Edit"
 msgid "SSL Port"
diff --git a/Localization/zh-Hant/OrchardCore.Infrastructure.Abstractions.po b/Localization/zh-Hant/OrchardCore.Infrastructure.Abstractions.po
index 5c7bc01ce4c93..5703c7036df51 100644
--- a/Localization/zh-Hant/OrchardCore.Infrastructure.Abstractions.po
+++ b/Localization/zh-Hant/OrchardCore.Infrastructure.Abstractions.po
@@ -10,35 +10,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:13\n"
+"PO-Revision-Date: 2023-12-22 16:24\n"
 
-#. throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:45
+#. ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:44
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Switch \"{0}\" was not found"
 msgstr ""
 
 #. throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, typeof(OrchardSwitchAttribute).Name]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:49
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:48
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "A property \"{0}\" exists but is not decorated with \"{1}\""
 msgstr ""
 
-#. string message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:61
+#. var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:60
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Error converting value \"{0}\" to \"{1}\" for switch \"{2}\""
 msgstr ""
 
-#. throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:77
+#. ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:75
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Command arguments \"{0}\" don't match command definition"
 msgstr ""
 
 #. throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:176
+#: OrchardCore.Infrastructure.Abstractions\Commands\DefaultCommandHandler.cs:174
 msgctxt "OrchardCore.Environment.Commands.DefaultCommandHandler"
 msgid "Method \"{0}\" does not support switch \"{1}\"."
 msgstr ""
 
+#. return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+#: OrchardCore.Infrastructure.Abstractions\Email\EmailAddressAttribute.cs:23
+msgctxt "OrchardCore.Email.EmailAddressAttribute"
+msgid "Invalid email address."
+msgstr ""
+
diff --git a/Localization/zh-Hant/OrchardCore.Layers.po b/Localization/zh-Hant/OrchardCore.Layers.po
index abdd752c6ebb0..0b07eea7977c3 100644
--- a/Localization/zh-Hant/OrchardCore.Layers.po
+++ b/Localization/zh-Hant/OrchardCore.Layers.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:04\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Layers\AdminMenu.cs:26
@@ -148,19 +148,19 @@ msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create Layer"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:7
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Description"
 msgstr ""
 
-#. <input class="button" type="submit" value="@T["Create"]" />
+#. <input class="btn btn-primary" type="submit" value="@T["Create"]" />
 #: OrchardCore.Layers\Views\Admin\Create.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Create"
 msgid "Create"
@@ -190,13 +190,13 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Edit Layer - {0}"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:18
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:24
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Description"
@@ -208,7 +208,7 @@ msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Error updating rule order"
 msgstr ""
 
-#. <input class="button mt-3" type="submit" value="@T["Save"]" />
+#. <input class="btn btn-primary mt-3" type="submit" value="@T["Save"]" />
 #: OrchardCore.Layers\Views\Admin\Edit.cshtml:35
 msgctxt "OrchardCore.Layers.Views.Admin.Edit"
 msgid "Save"
@@ -227,90 +227,90 @@ msgid "Save"
 msgstr ""
 
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Widgets and Layers"])</h1></zone>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:16
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:13
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit Widgets and Layers"
 msgstr ""
 
 #. @T["Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:20
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:17
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Widget successfully moved. <a href=\"javascript:console.log('submit');$('#undo-form').submit();\"><strong>Undo</strong></a>."
 msgstr ""
 
 #. <h3>@T["Zones"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:29
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:26
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Zones"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">define the available zones</a> before adding Widgets", Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = LayerSiteSettingsDisplayDriver.GroupId })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:33
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:30
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">define the available zones</a> before adding Widgets"
 msgstr ""
 
 #. @T["Add Widget"]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:78
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:79
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add Widget"
 msgstr ""
 
 #. <span>@T["No widgets found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:100
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:101
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No widgets found."
 msgstr ""
 
 #. <span>@T["No layers found."]</span>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:105
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:106
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "No layers found."
 msgstr ""
 
 #. <h3>@T["Layers"]</h3>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:114
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:115
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Layers"
 msgstr ""
 
 #. @T["Select a layer to reveal its associated widgets."]
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:117
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Select a layer to reveal its associated widgets."
 msgstr ""
 
 #. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Layers/#rules" target="_blank">@T["See documentation"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:118
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:119
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "See documentation"
 msgstr ""
 
 #. <a class="btn btn-primary btn-sm" href="@Url.Action("Edit", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })">@T["Edit"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:133
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Edit"
 msgstr ""
 
 #. <a class="btn btn-danger btn-sm" href="@Url.Action("Delete", "Admin", new { area = "OrchardCore.Layers", name = layer.Name })" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:134
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:135
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Delete"
 msgstr ""
 
 #. <p class="alert alert-warning">@T["Please <a href=\"{0}\">create a layer</a> before adding Widgets", Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })]</p>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:147
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:148
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Please <a href=\"{0}\">create a layer</a> before adding Widgets"
 msgstr ""
 
-#. <a class="button btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
-#: OrchardCore.Layers\Views\Admin\Index.cshtml:150
+#. <a class="btn btn-primary btn-sm" href="@Url.Action("Create", "Admin", new { area = "OrchardCore.Layers" })">@T["Add"]</a>
+#: OrchardCore.Layers\Views\Admin\Index.cshtml:151
 msgctxt "OrchardCore.Layers.Views.Admin.Index"
 msgid "Add"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "Title"
@@ -328,13 +328,13 @@ msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "If checked, the title will be rendered with the widget."
 msgstr ""
 
-#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
+#. <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
 #: OrchardCore.Layers\Views\LayerMetadata.Edit.cshtml:23
 msgctxt "OrchardCore.Layers.Views.LayerMetadata.Edit"
 msgid "The layer the widget should be associated with."
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available zones for Layers"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available zones for Layers"]</label>
 #: OrchardCore.Layers\Views\LayerSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Layers.Views.LayerSettings.Edit"
 msgid "Available zones for Layers"
diff --git a/Localization/zh-Hant/OrchardCore.Liquid.po b/Localization/zh-Hant/OrchardCore.Liquid.po
index 5a8f3d0c830a9..7404d93895317 100644
--- a/Localization/zh-Hant/OrchardCore.Liquid.po
+++ b/Localization/zh-Hant/OrchardCore.Liquid.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-17 16:48\n"
+"PO-Revision-Date: 2023-12-22 16:25\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:46
+#: OrchardCore.Liquid\Drivers\LiquidPartDisplayDriver.cs:47
 msgctxt "OrchardCore.Liquid.Drivers.LiquidPartDisplayDriver"
 msgid "The Liquid Body doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
+#. <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
 #: OrchardCore.Liquid\Views\LiquidPart.Edit.cshtml:15
 msgctxt "OrchardCore.Liquid.Views.LiquidPart.Edit"
 msgid "Body"
diff --git a/Localization/zh-Hant/OrchardCore.Lists.po b/Localization/zh-Hant/OrchardCore.Lists.po
index 97d253192d84f..6caf5bf52c005 100644
--- a/Localization/zh-Hant/OrchardCore.Lists.po
+++ b/Localization/zh-Hant/OrchardCore.Lists.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:05\n"
+"PO-Revision-Date: 2023-12-22 16:26\n"
 
 #. Description = S["the list part of the content item"];
 #: OrchardCore.Lists\GraphQL\ContainedInputObjectType.cs:13
@@ -31,27 +31,27 @@ msgid "Represents a link to the parent content item, and the order that content
 msgstr ""
 
 #. Description = S["Represents a collection of content items."];
-#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:24
+#: OrchardCore.Lists\GraphQL\ListQueryObjectType.cs:25
 msgctxt "OrchardCore.Lists.GraphQL.ListQueryObjectType"
 msgid "Represents a collection of content items."
 msgstr ""
 
-#. throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:371
+#. ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:358
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The specified Blog Post doesn't exist anymore. Please create a new Blog Post."
 msgstr ""
 
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
 #. throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:498
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:415
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:482
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "Not authorized to delete this content"
 msgstr ""
 
 #. throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:447
+#: OrchardCore.Lists\RemotePublishing\MetaWeblogHandler.cs:431
 msgctxt "OrchardCore.Lists.RemotePublishing.MetaWeblogHandler"
 msgid "The username or e-mail or password provided is incorrect."
 msgstr ""
@@ -68,7 +68,7 @@ msgctxt "OrchardCore.Lists.Views.ListPart"
 msgid "The list is empty"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Lists\Views\ListPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPart.DisplayOption"
 msgid "Standard"
@@ -128,7 +128,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Disable RSS feed link generation."
 msgstr ""
 
-#. <label asp-for="FeedProxyUrl">@T["Feed proxy Url"]</label>
+#. <label asp-for="FeedProxyUrl" class="form-label">@T["Feed proxy Url"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:10
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed proxy Url"
@@ -146,7 +146,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "The current feed is available at <a href=\"{0}\" target=\"_blank\">{0}</a>."
 msgstr ""
 
-#. <label asp-for="FeedItemsCount">@T["Feed items count"]</label>
+#. <label asp-for="FeedItemsCount" class="form-label">@T["Feed items count"]</label>
 #: OrchardCore.Lists\Views\ListPartFeed.Edit.cshtml:17
 msgctxt "OrchardCore.Lists.Views.ListPartFeed.Edit"
 msgid "Feed items count"
@@ -182,7 +182,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartNavigationAdmin"
 msgid "New"
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page Size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page Size"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Page Size"
@@ -206,7 +206,7 @@ msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Check this option to enable manual ordering of items."
 msgstr ""
 
-#. <label asp-for="ContainedContentTypes">@T["Contained Content Types"]</label>
+#. <label asp-for="ContainedContentTypes" class="form-label">@T["Contained Content Types"]</label>
 #: OrchardCore.Lists\Views\ListPartSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Lists.Views.ListPartSettings.Edit"
 msgid "Contained Content Types"
@@ -242,7 +242,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Lists"
 msgstr ""
 
-#. <label asp-for="IconForContentItems">@T["Icon for the content items"]</label>
+#. <label asp-for="IconForContentItems" class="form-label">@T["Icon for the content items"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:18
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the content items"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Add parent menu item"
 msgstr ""
 
-#. <label asp-for="IconForParentLink">@T["Icon for the parent menu item"]</label>
+#. <label asp-for="IconForParentLink" class="form-label">@T["Icon for the parent menu item"]</label>
 #: OrchardCore.Lists\Views\Items\ListsAdminNode.Fields.TreeEdit.cshtml:58
 msgctxt "OrchardCore.Lists.Views.Items.ListsAdminNode.Fields.TreeEdit"
 msgid "Icon for the parent menu item"
diff --git a/Localization/zh-Hant/OrchardCore.Localization.po b/Localization/zh-Hant/OrchardCore.Localization.po
index cf7d8c9db68ec..ace3ad367a112 100644
--- a/Localization/zh-Hant/OrchardCore.Localization.po
+++ b/Localization/zh-Hant/OrchardCore.Localization.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:06\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Localization\AdminMenu.cs:31
@@ -39,13 +39,13 @@ msgid "Cultures"
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:108
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:109
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "A culture is required"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:128
+#: OrchardCore.Localization\Drivers\LocalizationSettingsDisplayDriver.cs:129
 msgctxt "OrchardCore.Localization.Drivers.LocalizationSettingsDisplayDriver"
 msgid "The site has been restarted for the settings to take effect."
 msgstr ""
@@ -57,13 +57,13 @@ msgid "The active cultures configured for the site."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Culture settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-#: OrchardCore.Localization\Startup.cs:68
+#: OrchardCore.Localization\Startup.cs:69
 msgctxt "OrchardCore.Localization.LocalizationDeploymentStartup"
 msgid "Exports the culture settings."
 msgstr ""
@@ -98,7 +98,7 @@ msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Add culture"
 msgstr ""
 
-#. <label>@T["Define which cultures are supported by the site."]</label>
+#. <label class="form-label">@T["Define which cultures are supported by the site."]</label>
 #: OrchardCore.Localization\Views\LocalizationSettings.Edit.cshtml:75
 msgctxt "OrchardCore.Localization.Views.LocalizationSettings.Edit"
 msgid "Define which cultures are supported by the site."
diff --git a/Localization/zh-Hant/OrchardCore.Markdown.po b/Localization/zh-Hant/OrchardCore.Markdown.po
index 92209dbb6f3e2..73c35b1435464 100644
--- a/Localization/zh-Hant/OrchardCore.Markdown.po
+++ b/Localization/zh-Hant/OrchardCore.Markdown.po
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:27\n"
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownBodyPartDisplayDriver.cs:75
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownBodyPartDisplayDriver"
 msgid "{0} doesn't contain a valid Liquid expression. Details: {1}"
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, String.Join(" ", errors)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
 #: OrchardCore.Markdown\Drivers\MarkdownFieldDisplayDriver.cs:106
 msgctxt "OrchardCore.Markdown.Drivers.MarkdownFieldDisplayDriver"
 msgid "{0} field doesn't contain a valid Liquid expression. Details: {1}"
@@ -72,7 +72,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.DisplayOption"
 msgid "Standard"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Edit"
 msgid "The body of the content item, in Markdown format."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownBodyPart.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownBodyPart.Option"
 msgid "Standard"
@@ -120,19 +120,19 @@ msgctxt "OrchardCore.Markdown.Views.MarkdownField-Wysiwyg.Option"
 msgid "Wysiwyg editor"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Markdown\Views\MarkdownField.Option.cshtml:4
 msgctxt "OrchardCore.Markdown.Views.MarkdownField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Markdown\Views\MarkdownFieldSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Markdown.Views.MarkdownFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/zh-Hant/OrchardCore.Media.po b/Localization/zh-Hant/OrchardCore.Media.po
index 6160072e0fdd0..9946bc0225371 100644
--- a/Localization/zh-Hant/OrchardCore.Media.po
+++ b/Localization/zh-Hant/OrchardCore.Media.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:28\n"
 
 #. .Add(S["Content"], content => content
 #: OrchardCore.Media\AdminMenu.cs:25
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Cannot move media because a file already exists with the same name"
 msgstr ""
 
-#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", String.Join(",", filesOnError)].ToString());
+#. return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
 #: OrchardCore.Media\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Media.Controllers.AdminController"
 msgid "Error when moving files. Maybe they already exist on the target folder? Files on error: {0}"
@@ -167,13 +167,13 @@ msgid "A profile with the same name already exists."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:287
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:290
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profile deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:314
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:317
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Media profiles successfully removed."
 msgstr ""
@@ -181,95 +181,95 @@ msgstr ""
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:326
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:327
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:329
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:330
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default"
 msgstr ""
 
 #. model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
 #. model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:332
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:333
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:335
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Custom Size"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:336
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Default (Max)"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:337
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Max"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:338
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Crop"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:339
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Pad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:340
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:343
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "BoxPad"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:341
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:344
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Min"
 msgstr ""
 
 #. model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:342
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:345
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Stretch"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:346
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Bmp"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:347
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Gif"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:348
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Jpg"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:349
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:352
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Png"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:350
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:353
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "Tga"
 msgstr ""
 
 #. model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
-#: OrchardCore.Media\Controllers\MediaProfilesController.cs:351
+#: OrchardCore.Media\Controllers\MediaProfilesController.cs:354
 msgctxt "OrchardCore.Media.Controllers.MediaProfilesController"
 msgid "WebP"
 msgstr ""
@@ -280,7 +280,7 @@ msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "{0}: There was an error handling the files."
 msgstr ""
 
-#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", String.Join(", ", settings.AllowedExtensions)]);
+#. updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
 #: OrchardCore.Media\Drivers\MediaFieldDisplayDriver.cs:133
 msgctxt "OrchardCore.Media.Drivers.MediaFieldDisplayDriver"
 msgid "Media extension is not allowed. Only media with '{0}' extensions are allowed."
@@ -316,7 +316,7 @@ msgctxt "OrchardCore.Media.GraphQL.MediaAssetQuery"
 msgid "Whether to get the assets from just the top directory or from all sub-directories as well."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(Prefix, String.Empty, S["Please select at least one extension."]);
+#. context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
 #: OrchardCore.Media\Settings\MediaFieldSettingsDriver.cs:98
 msgctxt "OrchardCore.Media.Settings.MediaFieldSettingsDriver"
 msgid "Please select at least one extension."
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Create Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:9
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Name"
@@ -370,7 +370,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:20
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Hint"
@@ -382,7 +382,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:31
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Width"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Height"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Resize Mode"
@@ -418,7 +418,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:68
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Background Color"
@@ -430,7 +430,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,80'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:79
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Format"
@@ -442,7 +442,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Create.cshtml:90
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Create"
 msgid "Quality"
@@ -484,7 +484,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Edit Media Profile"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:10
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Name"
@@ -496,7 +496,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The name of the media profile."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:21
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Hint"
@@ -508,7 +508,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "The hint for the media profile."
 msgstr ""
 
-#. <label asp-for="SelectedWidth">@T["Width"]</label>
+#. <label asp-for="SelectedWidth" class="form-label">@T["Width"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Width"
@@ -520,7 +520,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the width for the processed image. A default value means a width command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedHeight">@T["Height"]</label>
+#. <label asp-for="SelectedHeight" class="form-label">@T["Height"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:45
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Height"
@@ -532,7 +532,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the height for the processed image. A default value means a height command will not be applied."
 msgstr ""
 
-#. <label asp-for="SelectedMode">@T["Resize Mode"]</label>
+#. <label asp-for="SelectedMode" class="form-label">@T["Resize Mode"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:58
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Resize Mode"
@@ -544,7 +544,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the resize mode for the processed image."
 msgstr ""
 
-#. <label asp-for="BackgroundColor">@T["Background Color"]</label>
+#. <label asp-for="BackgroundColor" class="form-label">@T["Background Color"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:69
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Background Color"
@@ -556,7 +556,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the background color for the processed image. An empty value means a bgcolor command will not be applied. Examples of valid values: 'white', 'ffff00', 'ffff0080', '128,64,32' and '128,64,32,16'."
 msgstr ""
 
-#. <label asp-for="SelectedFormat">@T["Format"]</label>
+#. <label asp-for="SelectedFormat" class="form-label">@T["Format"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:80
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Format"
@@ -568,7 +568,7 @@ msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Select the format for the processed image. A default value means a format command will not be applied."
 msgstr ""
 
-#. <label asp-for="Quality">@T["Quality"]</label>
+#. <label asp-for="Quality" class="form-label">@T["Quality"]</label>
 #: OrchardCore.Media\Views\MediaProfiles\Edit.cshtml:91
 msgctxt "OrchardCore.Media.Views.MediaProfiles.Edit"
 msgid "Quality"
@@ -768,7 +768,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Invert"
 msgstr ""
 
-#. @T["Delete"] <span class="badge rounded-pill bg-light" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
+#. @T["Delete"] <span class="badge rounded-pill text-bg-theme" v-show="selectedMedias.length > 0">{{ selectedMedias.length}}</span>
 #. <input type="hidden" id="t-delete-button" value="@T["Delete"]" />
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:44
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:139
@@ -1000,7 +1000,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Create Folder"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["Folder name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["Folder name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:175
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Folder name"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "Rename Item"
 msgstr ""
 
-#. <label for="input" class="form-control-label" id="input-label">@T["New Name"]</label>
+#. <label for="input" class="form-label" id="input-label">@T["New Name"]</label>
 #: OrchardCore.Media\Views\Admin\MediaApplication.cshtml:197
 msgctxt "OrchardCore.Media.Views.Admin.MediaApplication"
 msgid "New Name"
@@ -1058,13 +1058,13 @@ msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "Media"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:13
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No media selected."]</span>
+#. <span class="badge text-bg-warning">@T["No media selected."]</span>
 #: OrchardCore.Media\Views\Items\MediaDeploymentStep.Fields.Summary.cshtml:31
 msgctxt "OrchardCore.Media.Views.Items.MediaDeploymentStep.Fields.Summary"
 msgid "No media selected."
@@ -1083,43 +1083,43 @@ msgid "Exports all or specified media."
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:32
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:34
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:45
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:44
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <input type="hidden" id="t-error" value="@T["This file exceeds the maximum upload size"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "This file exceeds the maximum upload size"
 msgstr ""
 
 #. <input type="hidden" id="t-uploads" value="@T["Uploads"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:59
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Uploads"
 msgstr ""
 
 #. <input type="hidden" id="t-errors" value="@T["Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:60
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Errors"
 msgstr ""
 
 #. <input type="hidden" id="t-clear-errors" value="@T["Clear Errors"]" />
-#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:62
+#: OrchardCore.Media\Views\MediaField-Attached.Edit.cshtml:61
 msgctxt "OrchardCore.Media.Views.MediaField-Attached.Edit"
 msgid "Clear Errors"
 msgstr ""
@@ -1130,49 +1130,49 @@ msgctxt "OrchardCore.Media.Views.MediaField-Attached.Option"
 msgid "Attached"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. <span v-show="!smallThumbs" title="@T[" Small Thumbs"]"><i class="fa-solid fa-compress-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:27
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Small Thumbs"
 msgstr ""
 
 #. <span v-show="smallThumbs" title="@T[" Large Thumbs"]"><i class="fa-solid fa-expand-alt" aria-hidden="true"></i></span>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:29
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:28
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid " Large Thumbs"
 msgstr ""
 
 #. <code class="text-end" v-if="selectedMedia">@T["{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"]</code>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:37
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:36
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "{{{{ selectedMedia.name }}}}{{{{ selectedMedia.mediaText === '' ? '' : ', ' + selectedMedia.mediaText }}}} ({{{{ isNaN(fileSize)? 0 : fileSize }}}} KB)"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Select Media"]</h5>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:52
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:51
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Select Media"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary mediaFieldSelectButton">@T["OK"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:56
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "OK"
 msgstr "確定"
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.Media\Views\MediaField.Edit.cshtml:58
+#: OrchardCore.Media\Views\MediaField.Edit.cshtml:57
 msgctxt "OrchardCore.Media.Views.MediaField.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Media\Views\MediaField.Option.cshtml:4
 msgctxt "OrchardCore.Media.Views.MediaField.Option"
 msgid "Standard"
@@ -1292,7 +1292,7 @@ msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Whether selecting an anchor point for resizing is allowed."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Media\Views\MediaFieldSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Media.Views.MediaFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/zh-Hant/OrchardCore.Menu.po b/Localization/zh-Hant/OrchardCore.Menu.po
index 7a6a73407be18..826618b8bd18f 100644
--- a/Localization/zh-Hant/OrchardCore.Menu.po
+++ b/Localization/zh-Hant/OrchardCore.Menu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-18 19:43\n"
+"PO-Revision-Date: 2023-12-22 16:29\n"
 
 #. builder.Add(S["Content"], design => design
 #: OrchardCore.Menu\AdminMenu.cs:33
@@ -27,7 +27,7 @@ msgid "Menus"
 msgstr "選單"
 
 #. await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
-#: OrchardCore.Menu\Controllers\AdminController.cs:282
+#: OrchardCore.Menu\Controllers\AdminController.cs:283
 msgctxt "OrchardCore.Menu.Controllers.AdminController"
 msgid "Menu item deleted successfully."
 msgstr ""
@@ -60,7 +60,7 @@ msgctxt "OrchardCore.Menu.Drivers.MenuPartDisplayDriver"
 msgid "Publishing this content item may erase created content. Fix any content type issues beforehand."
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\ContentMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.ContentMenuItemPart.Edit"
 msgid "Name"
@@ -90,19 +90,19 @@ msgctxt "OrchardCore.Menu.Views.Admin.Edit"
 msgid "Edit {0}"
 msgstr "編輯 {0}"
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+#. <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
 #: OrchardCore.Menu\Views\HtmlMenuItemPart.Edit.cshtml:19
 msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPart.Edit"
 msgid "Html"
@@ -138,13 +138,13 @@ msgctxt "OrchardCore.Menu.Views.HtmlMenuItemPartSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
+#. <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:5
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Name"
 msgstr "名稱"
 
-#. <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+#. <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
 #: OrchardCore.Menu\Views\LinkMenuItemPart.Edit.cshtml:12
 msgctxt "OrchardCore.Menu.Views.LinkMenuItemPart.Edit"
 msgid "Url"
diff --git a/Localization/zh-Hant/OrchardCore.Microsoft.Authentication.po b/Localization/zh-Hant/OrchardCore.Microsoft.Authentication.po
index 996eee5b739f5..0e7bc694ec1d0 100644
--- a/Localization/zh-Hant/OrchardCore.Microsoft.Authentication.po
+++ b/Localization/zh-Hant/OrchardCore.Microsoft.Authentication.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Microsoft.Authentication\AdminMenuMicrosoftAccount.cs:23
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "Microsoft Account Authentication Settings"
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "AppId"
@@ -184,7 +184,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application ID found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["Secret Key"]</label>
+#. <label asp-for="AppSecret" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "Secret Key"
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edi
 msgid "The Application secret key found on the Microsoft developer portal parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftAccountSettings.Edit.cshtml:31
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftAccountSettings.Edit"
 msgid "CallbackPath"
@@ -238,7 +238,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "Microsoft Entra ID Authentication Settings"
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:12
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "Display Name"
@@ -250,7 +250,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The display name of the provider."
 msgstr ""
 
-#. <label>@T["AppId"]</label>
+#. <label asp-for="AppId" class="form-label">@T["AppId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:19
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "AppId"
@@ -262,7 +262,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Application ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["TenantId"]</label>
+#. <label asp-for="TenantId" class="form-label">@T["TenantId"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "TenantId"
@@ -274,7 +274,7 @@ msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edi
 msgid "The Tenant (Directory) ID found on the Microsoft Entra ID App registration parameters."
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Microsoft.Authentication\Views\MicrosoftEntraIDSettings.Edit.cshtml:33
 msgctxt "OrchardCore.Microsoft.Authentication.Views.MicrosoftEntraIDSettings.Edit"
 msgid "CallbackPath"
diff --git a/Localization/zh-Hant/OrchardCore.Navigation.po b/Localization/zh-Hant/OrchardCore.Navigation.po
index 742b467fdf3d9..31f249e9d7c72 100644
--- a/Localization/zh-Hant/OrchardCore.Navigation.po
+++ b/Localization/zh-Hant/OrchardCore.Navigation.po
@@ -10,38 +10,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. var firstText = FirstText ?? S["<<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:177
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<<"
 msgstr ""
 
 #. var previousText = PreviousText ?? S["<"];
 #. var previousText = PreviousText ?? S["<"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:178
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:367
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:370
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "<"
 msgstr ""
 
 #. var nextText = NextText ?? S[">"];
 #. var nextText = NextText ?? S[">"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:179
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:368
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:371
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">"
 msgstr ""
 
 #. var lastText = LastText ?? S[">>"];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:180
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:182
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid ">>"
 msgstr ""
 
 #. var gapText = GapText ?? S["..."];
-#: OrchardCore.Navigation\PagerShapesTableProvider.cs:181
+#: OrchardCore.Navigation\PagerShapesTableProvider.cs:183
 msgctxt "OrchardCore.Navigation.PagerShapes"
 msgid "..."
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Notifications.po b/Localization/zh-Hant/OrchardCore.Notifications.po
index 291a6f4570917..2cdda6e5713c3 100644
--- a/Localization/zh-Hant/OrchardCore.Notifications.po
+++ b/Localization/zh-Hant/OrchardCore.Notifications.po
@@ -10,16 +10,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Notify Content's Owner Task"];
-#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:40
+#: OrchardCore.Notifications\Activities\NotifyContentOwnerTask.cs:38
 msgctxt "OrchardCore.Notifications.Activities.NotifyContentOwnerTask"
 msgid "Notify Content's Owner Task"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Notify User Task"];
-#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:32
+#: OrchardCore.Notifications\Activities\NotifyUserTask.cs:30
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTask"
 msgid "Notify User Task"
 msgstr ""
@@ -30,61 +30,61 @@ msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Notifications"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Done"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed"
 msgstr ""
 
-#. return Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
-#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:67
+#. => Outcomes(S["Done"], S["Failed"], S["Failed: no user found"]);
+#: OrchardCore.Notifications\Activities\NotifyUserTaskActivity.cs:66
 msgctxt "OrchardCore.Notifications.Activities.NotifyUserTaskActivity"
 msgid "Failed: no user found"
 msgstr ""
 
-#. new SelectListItem(S["Read"], NotificationStatus.Read.ToString()),
+#. new(S["Read"], nameof(NotificationStatus.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:94
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Read"
 msgstr ""
 
-#. new SelectListItem(S["Unread"], NotificationStatus.Unread.ToString()),
+#. new(S["Unread"], nameof(NotificationStatus.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:95
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Unread"
 msgstr ""
 
-#. new SelectListItem(S["Recently created"], NotificationOrder.Latest.ToString()),
+#. new(S["Recently created"], nameof(NotificationOrder.Latest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem(S["Previously created"], NotificationOrder.Oldest.ToString()),
+#. new(S["Previously created"], nameof(NotificationOrder.Oldest)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:100
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Previously created"
 msgstr ""
 
-#. new SelectListItem(S["Mark as read"], NotificationBulkAction.Read.ToString()),
+#. new(S["Mark as read"], nameof(NotificationBulkAction.Read)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as read"
 msgstr ""
 
-#. new SelectListItem(S["Mark as unread"], NotificationBulkAction.Unread.ToString()),
+#. new(S["Mark as unread"], nameof(NotificationBulkAction.Unread)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:105
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Mark as unread"
 msgstr ""
 
-#. new SelectListItem(S["Remove"], NotificationBulkAction.Remove.ToString()),
+#. new(S["Remove"], nameof(NotificationBulkAction.Remove)),
 #: OrchardCore.Notifications\Controllers\AdminController.cs:106
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "Remove"
@@ -94,31 +94,31 @@ msgstr ""
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "notification"
 msgid_plural "notifications"
 msgstr[0] ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} unread successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:193
+#: OrchardCore.Notifications\Controllers\AdminController.cs:205
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} unread successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
 #. await _notifier.SuccessAsync(H["{0} {1} read successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:214
-#: OrchardCore.Notifications\Controllers\AdminController.cs:261
+#: OrchardCore.Notifications\Controllers\AdminController.cs:226
+#: OrchardCore.Notifications\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} read successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["{0} {1} removed successfully.", counter, H.Plural(counter, "notification", "notifications")]);
-#: OrchardCore.Notifications\Controllers\AdminController.cs:225
+#: OrchardCore.Notifications\Controllers\AdminController.cs:237
 msgctxt "OrchardCore.Notifications.Controllers.AdminController"
 msgid "{0} {1} removed successfully."
 msgstr ""
@@ -144,15 +144,15 @@ msgid "Mark as read"
 msgstr ""
 
 #. @T["No notifications found."]
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:55
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:62
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "No notifications found."
 msgstr ""
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:109
-#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:120
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:117
+#: OrchardCore.Notifications\Views\NotificationsAdminList.cshtml:128
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminList"
 msgid "selected"
 msgstr ""
@@ -249,20 +249,20 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Select All"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "1 item"
 msgid_plural "{0} items"
 msgstr[0] ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid "Items {0} to {1}"
 msgstr ""
 
-#. <label id="items" for="select-all">@T.Plural((int)Model.NotficationsItemsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
+#. <label id="items" for="select-all">@T.Plural((int)Model.NotificationsCount, "1 item", "{0} items")<span class="text-muted" title="@T["Items {0} to {1}", (int)Model.StartIndex, (int)Model.EndIndex]">@T.Plural((int)Model.TotalItemCount, " / {0} item in total", " / {0} items in total")</span></label>
 #: OrchardCore.Notifications\Views\NotificationsAdminListSummary.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.NotificationsAdminListSummary"
 msgid " / {0} item in total"
@@ -321,13 +321,13 @@ msgctxt "OrchardCore.Notifications.Views.NotificationsButtonActions_SummaryAdmin
 msgid "Delete"
 msgstr ""
 
-#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify user"])</h4>
+#. <h4><i class="fa-solid fa-envelope" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Notify Content Owner"])</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Design.cshtml:8
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Design"
-msgid "Notify user"
+msgid "Notify Content Owner"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Subject"
@@ -339,7 +339,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "Text Body"
@@ -351,7 +351,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edit"
 msgid "HTML Body"
@@ -375,10 +375,10 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify owner"]</h4>
+#. <h4 class="card-title"><i class="fa-solid fa-envelope" aria-hidden="true"></i>@T["Notify Content Owner"]</h4>
 #: OrchardCore.Notifications\Views\Items\NotifyContentOwnerTask.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyContentOwnerTask.Fields.Thumbnail"
-msgid "Notify owner"
+msgid "Notify Content Owner"
 msgstr ""
 
 #. <p>@T["Notify content owner"]</p>
@@ -401,7 +401,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTask.Fields.Thumbnail"
 msgid "Notify user"
 msgstr ""
 
-#. <label asp-for="Subject">@T["Subject"]</label>
+#. <label asp-for="Subject" class="form-label">@T["Subject"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Subject"
@@ -413,7 +413,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="TextBody">@T["Text Body"]</label>
+#. <label asp-for="TextBody" class="form-label">@T["Text Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "Text Body"
@@ -425,7 +425,7 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "This optional text body does not support HTML. You may use Liquid syntax."
 msgstr ""
 
-#. <label asp-for="HtmlBody">@T["HTML Body"]</label>
+#. <label asp-for="HtmlBody" class="form-label">@T["HTML Body"]</label>
 #: OrchardCore.Notifications\Views\Items\NotifyUserTaskActivity.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edit"
 msgid "HTML Body"
@@ -449,35 +449,30 @@ msgctxt "OrchardCore.Notifications.Views.Items.NotifyUserTaskActivity.Fields.Edi
 msgid "When checked, the notification provider will use the HTML body if it supports HTML."
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "notification"
-msgid_plural "notifications"
-msgstr[0] ""
-
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have more than {0} unread {1}"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
 msgstr ""
 
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:0
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
-msgid "You have {0} unread {1}"
-msgstr ""
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:0
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
 
 #. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:23
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:28
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "You have no unread notifications"
 msgstr ""
 
-#. <div><a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a></div>
-#: OrchardCore.Notifications\Views\UserNotificationCollection.cshtml:42
-msgctxt "OrchardCore.Notifications.Views.UserNotificationCollection"
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: OrchardCore.Notifications\Views\UserNotificationNavbar.cshtml:51
+msgctxt "OrchardCore.Notifications.Views.UserNotificationNavbar"
 msgid "Notification Center"
 msgstr ""
 
-#. <label asp-for="Methods">@T["Notification Methods"]</label>
+#. <label asp-for="Methods" class="form-label">@T["Notification Methods"]</label>
 #: OrchardCore.Notifications\Views\UserNotificationPreferencesPart.Edit.cshtml:7
 msgctxt "OrchardCore.Notifications.Views.UserNotificationPreferencesPart.Edit"
 msgid "Notification Methods"
diff --git a/Localization/zh-Hant/OrchardCore.OpenId.po b/Localization/zh-Hant/OrchardCore.OpenId.po
index 1f934f82c4a94..abf44eede8ed1 100644
--- a/Localization/zh-Hant/OrchardCore.OpenId.po
+++ b/Localization/zh-Hant/OrchardCore.OpenId.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:10\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.OpenId\AdminMenu.cs:31
@@ -119,13 +119,13 @@ msgid "The name is already taken by another scope."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ServerConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ServerConfigurationController"
 msgid "OpenID server configuration successfully updated."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
-#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:96
+#: OrchardCore.OpenId\Controllers\ValidationConfigurationController.cs:97
 msgctxt "OrchardCore.OpenId.Controllers.ValidationConfigurationController"
 msgid "OpenID validation configuration successfully updated."
 msgstr ""
@@ -408,19 +408,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Create a new application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:14
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:19
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:24
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Type"
@@ -444,7 +444,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"]</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Client Secret"
@@ -518,7 +518,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:94
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Redirect Uris"
@@ -536,7 +536,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Allow Logout Endpoint"
 msgstr ""
 
-#. <label asp-for="PostLogoutRedirectUris">@T["Logout Redirect Uris"]</label>
+#. <label asp-for="PostLogoutRedirectUris" class="form-label">@T["Logout Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:110
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Logout Redirect Uris"
@@ -560,7 +560,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Ensure that the client application and OAuth or OIDC library being used supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Create.cshtml:131
 msgctxt "OrchardCore.OpenId.Views.Application.Create"
 msgid "Consent type"
@@ -638,19 +638,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Create a new scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Description"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Create.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Create"
 msgid "Additional resources (API audiences)"
@@ -692,19 +692,19 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Edit an application"
 msgstr ""
 
-#. <label asp-for="ClientId">@T["Client Id"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["Client Id"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Id"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:20
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Type">@T["Type"]</label>
+#. <label asp-for="Type" class="form-label">@T["Type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Type"
@@ -728,13 +728,13 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Confidential applications MUST send their client secret when communicating with the token and revocation endpoints. This guarantees that only the legit client can exchange an authorization code or get a refresh token."
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Client Secret"
 msgstr ""
 
-#. <label asp-for="ClientSecret">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"] (@T["enter a new value to replace the existing secret"])</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:33
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "enter a new value to replace the existing secret"
@@ -820,7 +820,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Allow Refresh Token Flow"
 msgstr ""
 
-#. <label asp-for="RedirectUris">@T["Redirect Uris"]</label>
+#. <label asp-for="RedirectUris" class="form-label">@T["Redirect Uris"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:107
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Redirect Uris"
@@ -862,7 +862,7 @@ msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Ensure that the client/client library supports PKCE before enabling this option."
 msgstr ""
 
-#. <label asp-for="ConsentType">@T["Consent type"]</label>
+#. <label asp-for="ConsentType" class="form-label">@T["Consent type"]</label>
 #: OrchardCore.OpenId\Views\Application\Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.Application.Edit"
 msgid "Consent type"
@@ -940,19 +940,19 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Edit a scope"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:9
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="DisplayName">@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:15
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Display Name"
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:21
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Description"
@@ -970,7 +970,7 @@ msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Note: the server tenant is always included in the access token audiences, even if no scope is requested."
 msgstr ""
 
-#. <label asp-for="Resources">@T["Additional resources (API audiences)"]</label>
+#. <label asp-for="Resources" class="form-label">@T["Additional resources (API audiences)"]</label>
 #: OrchardCore.OpenId\Views\Scope\Edit.cshtml:40
 msgctxt "OrchardCore.OpenId.Views.Scope.Edit"
 msgid "Additional resources (API audiences)"
@@ -1090,7 +1090,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label>@T["Display Name"]</label>
+#. <label asp-for="DisplayName" class="form-label">@T["Display Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:16
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display Name"
@@ -1102,7 +1102,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Display name of the IdP"
 msgstr ""
 
-#. <label>@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:23
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority"
@@ -1114,7 +1114,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Authority to use when making OpenIdConnect calls"
 msgstr ""
 
-#. <label>@T["ClientId"]</label>
+#. <label asp-for="ClientId" class="form-label">@T["ClientId"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:30
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "ClientId"
@@ -1126,7 +1126,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "the 'client_id'"
 msgstr ""
 
-#. <label>@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:37
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "CallbackPath"
@@ -1138,7 +1138,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The request path within the application's base path where the user-agent will be returned. The middleware will process this request when it arrives."
 msgstr ""
 
-#. <label>@T["SignedOut CallbackPath"]</label>
+#. <label asp-for="SignedOutCallbackPath" class="form-label">@T["SignedOut CallbackPath"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:44
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut CallbackPath"
@@ -1156,7 +1156,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "See post_logout_redirect_uri from "
 msgstr ""
 
-#. <label>@T["SignedOut Redirect Uri"]</label>
+#. <label asp-for="SignedOutRedirectUri" class="form-label">@T["SignedOut Redirect Uri"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:52
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "SignedOut Redirect Uri"
@@ -1168,7 +1168,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "The uri where the user agent will be redirected to after application is signed out from the identity provider. The redirect will happen after the SignedOutCallbackPath is invoked."
 msgstr ""
 
-#. <label asp-for="Scopes">@T["Scopes"]</label>
+#. <label asp-for="Scopes" class="form-label">@T["Scopes"]</label>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:59
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Scopes"
@@ -1200,10 +1200,10 @@ msgstr ""
 
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth</a></h5>
 #. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#HybridAuthRequest</a></h5>
-#. <h5 class="mb-3"><a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a></h5>
+#. <a class="hint" href="http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest" target="_blank">@T["see: "]http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthRequest</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:74
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:84
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:111
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:114
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "see: "
 msgstr ""
@@ -1217,15 +1217,15 @@ msgstr ""
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#codeExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#codeExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_tokenExample</a></span>
 #. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-id_token-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a></span>
-#. <span class="hint dashed"><a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a></span>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#code-tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_tokenExample</a>
+#. <a href="http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample" target="_blank">@T["example:"] http://openid.net/specs/openid-connect-core-1_0.html#id_token-tokenExample</a>
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:79
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:90
 #: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:98
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:106
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:117
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:125
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:107
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:122
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:132
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "example:"
 msgstr ""
@@ -1255,111 +1255,111 @@ msgid "Use 'code token' response type"
 msgstr ""
 
 #. <h3>@T["Implicit Authentication Flow"]</h3>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:110
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:112
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Implicit Authentication Flow"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenFlow">@T["Use 'id_token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:116
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:120
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token' response type"
 msgstr ""
 
 #. <label class="form-check-label" asp-for="UseIdTokenTokenFlow">@T["Use 'id_token token' response type"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:124
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Use 'id_token token' response type"
 msgstr ""
 
-#. <label>@T["Response Mode"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:130
+#. <label asp-for="ResponseMode" class="form-label">@T["Response Mode"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:138
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Response Mode"
 msgstr ""
 
 #. <span class="hint">@T["Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:137
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:145
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Configure Response Mode see: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthResponse"
 msgstr ""
 
-#. <label>@T["Client Secret"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:141
+#. <label asp-for="ClientSecret" class="form-label">@T["Client Secret"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:149
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Client Secret"
 msgstr ""
 
 #. <span class="hint">@T["set client secret."]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:144
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "set client secret."
 msgstr ""
 
 #. <th scope="col">@T["Parameter Name"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:151
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:159
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameter Name"
 msgstr ""
 
 #. <th scope="col" colspan="3">@T["Value"]</th>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:152
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Value"
 msgstr ""
 
 #. <a v-on:click="remove(index)" href="javascript:void(0)" title="@T["Remove parameter from list"]" class="btn">
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:164
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:172
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Remove parameter from list"
 msgstr ""
 
 #. <a v-on:click="add()" class="btn btn-light w-100 btn-sm"><i class="fa-solid fa-plus small" aria-hidden="true"></i> @T["Add a parameter"]</a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:174
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:182
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Add a parameter"
 msgstr ""
 
 #. <h5 class="modal-title">@T["Edit Data"]</h5>
 #. <a href="javascript:void(0)" v-on:click="showModal" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:187
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:210
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:195
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:218
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="parameters-textarea">@T["Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:192
+#. <label for="parameters-textarea" class="form-label">@T["Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:200
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Parameters"
 msgstr ""
 
 #. <span class="hint">@T["A JSON representation of the allowed values, e.g. {0}", "[ { name: 'First parameter', value: 'parameter1' }, { name: 'Second parameter', value: 'parameter2' } ]"]</span>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:194
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:202
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "A JSON representation of the allowed values, e.g. {0}"
 msgstr ""
 
 #. <button type="button" class="btn btn-primary btn-submit" v-on:click="closeModal()">@T["OK"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:198
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:206
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "OK"
 msgstr ""
 
 #. <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">@T["Cancel"]</button>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:199
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:207
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Parameters">@T["Advanced Parameters"]</label>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:209
+#. <label asp-for="Parameters" class="form-label">@T["Advanced Parameters"]</label>
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:217
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced Parameters"
 msgstr ""
 
 #. <div class="hint">@T["Advanced parameters that can be sent with the authorize request."]</div>
-#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:213
+#: OrchardCore.OpenId\Views\OpenIdClientSettings.Edit.cshtml:221
 msgctxt "OrchardCore.OpenId.Views.OpenIdClientSettings.Edit"
 msgid "Advanced parameters that can be sent with the authorize request."
 msgstr ""
@@ -1546,7 +1546,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "These options are all optional and are for advanced users only."
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:123
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Authority"
@@ -1558,7 +1558,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "The base URL of the identity server (this site). If none is provided, a default value based on the site host is automatically computed."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreLocation">@T["Encryption Certificate Store Location"]</label>
+#. <label asp-for="EncryptionCertificateStoreLocation" class="form-label">@T["Encryption Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:130
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Location"
@@ -1586,7 +1586,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate location."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateStoreName">@T["Encryption Certificate Store Name"]</label>
+#. <label asp-for="EncryptionCertificateStoreName" class="form-label">@T["Encryption Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:144
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate Store Name"
@@ -1598,7 +1598,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the encryption certificate store."
 msgstr ""
 
-#. <label asp-for="EncryptionCertificateThumbprint">@T["Encryption Certificate"]</label>
+#. <label asp-for="EncryptionCertificateThumbprint" class="form-label">@T["Encryption Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:160
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Encryption Certificate"
@@ -1618,7 +1618,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "You need to add a certificate to your server for setting up OpenID Connect module."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreLocation">@T["Signing Certificate Store Location"]</label>
+#. <label asp-for="SigningCertificateStoreLocation" class="form-label">@T["Signing Certificate Store Location"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:194
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Location"
@@ -1630,7 +1630,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate location."
 msgstr ""
 
-#. <label asp-for="SigningCertificateStoreName">@T["Signing Certificate Store Name"]</label>
+#. <label asp-for="SigningCertificateStoreName" class="form-label">@T["Signing Certificate Store Name"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:208
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate Store Name"
@@ -1642,7 +1642,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Select the signing certificate store."
 msgstr ""
 
-#. <label asp-for="SigningCertificateThumbprint">@T["Signing Certificate"]</label>
+#. <label asp-for="SigningCertificateThumbprint" class="form-label">@T["Signing Certificate"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:224
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Signing Certificate"
@@ -1666,7 +1666,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "When this option is enabled, refresh tokens are not marked as redeemed and can be reused until they expire."
 msgstr ""
 
-#. <label asp-for="AccessTokenFormat">@T["Token Format"]</label>
+#. <label asp-for="AccessTokenFormat" class="form-label">@T["Token Format"]</label>
 #: OrchardCore.OpenId\Views\OpenIdServerSettings.Edit.cshtml:266
 msgctxt "OrchardCore.OpenId.Views.OpenIdServerSettings.Edit"
 msgid "Token Format"
@@ -1744,13 +1744,13 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="Tenant">@T["Authorization server tenant"]</label>
+#. <label asp-for="Tenant" class="form-label">@T["Authorization server tenant"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authorization server tenant"
 msgstr ""
 
-#. <label asp-for="Authority">@T["Authority"]</label>
+#. <label asp-for="Authority" class="form-label">@T["Authority"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:25
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Authority"
@@ -1762,7 +1762,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The address of the remote OpenID Connect server. Using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="MetadataAddress">@T["OpenID Connect Metadata Address"]</label>
+#. <label asp-for="MetadataAddress" class="form-label">@T["OpenID Connect Metadata Address"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:32
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "OpenID Connect Metadata Address"
@@ -1774,7 +1774,7 @@ msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "The well-formed URI of the OpenID Connect Metadata Address endpoint. This is only for advanced scenarios when metadata is not available from the standard authority endpoint. It cannot be used when using a Tenant and using a HTTPS address is strongly recommended."
 msgstr ""
 
-#. <label asp-for="Audience">@T["Audience"]</label>
+#. <label asp-for="Audience" class="form-label">@T["Audience"]</label>
 #: OrchardCore.OpenId\Views\OpenIdValidationSettings.Edit.cshtml:39
 msgctxt "OrchardCore.OpenId.Views.OpenIdValidationSettings.Edit"
 msgid "Audience"
diff --git a/Localization/zh-Hant/OrchardCore.Placements.po b/Localization/zh-Hant/OrchardCore.Placements.po
index 0a4f934708bef..882e40ed81a4e 100644
--- a/Localization/zh-Hant/OrchardCore.Placements.po
+++ b/Localization/zh-Hant/OrchardCore.Placements.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:41\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Placements\AdminMenu.cs:25
@@ -39,39 +39,39 @@ msgid "Placement rules for \"{0}\" already exists. Please edit existing rule."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:197
+#: OrchardCore.Placements\Controllers\AdminController.cs:198
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement have been saved."
 msgstr ""
 
 #. await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:201
+#: OrchardCore.Placements\Controllers\AdminController.cs:202
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement is empty."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
 #. await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:208
-#: OrchardCore.Placements\Controllers\AdminController.cs:240
+#: OrchardCore.Placements\Controllers\AdminController.cs:209
+#: OrchardCore.Placements\Controllers\AdminController.cs:241
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "The \"{0}\" placement has been deleted."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:213
+#: OrchardCore.Placements\Controllers\AdminController.cs:214
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while parsing the placement<br/>{0}"
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:218
+#: OrchardCore.Placements\Controllers\AdminController.cs:219
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "An error occurred while saving the placement."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Placements successfully removed."]);
-#: OrchardCore.Placements\Controllers\AdminController.cs:265
+#: OrchardCore.Placements\Controllers\AdminController.cs:266
 msgctxt "OrchardCore.Placements.Controllers.AdminController"
 msgid "Placements successfully removed."
 msgstr ""
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Edit Placement"
 msgstr ""
 
-#. <label asp-for="ShapeType">@T["Shape type"]</label>
+#. <label asp-for="ShapeType" class="form-label">@T["Shape type"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:22
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Shape type"
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "The type of the shape."
 msgstr ""
 
-#. <label asp-for="Nodes">@T["Placement rules"]</label>
+#. <label asp-for="Nodes" class="form-label">@T["Placement rules"]</label>
 #: OrchardCore.Placements\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Placements.Views.Admin.Edit"
 msgid "Placement rules"
diff --git a/Localization/zh-Hant/OrchardCore.ProjectTemplates.po b/Localization/zh-Hant/OrchardCore.ProjectTemplates.po
index f299c4b925c30..9f700057ff394 100644
--- a/Localization/zh-Hant/OrchardCore.ProjectTemplates.po
+++ b/Localization/zh-Hant/OrchardCore.ProjectTemplates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:19\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.V
 msgid "Show"
 msgstr ""
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.ProjectTemplates\content\OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.ProjectTemplates.content.OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/zh-Hant/OrchardCore.PublishLater.po b/Localization/zh-Hant/OrchardCore.PublishLater.po
index e2d54e35b4754..11deb2d5f269a 100644
--- a/Localization/zh-Hant/OrchardCore.PublishLater.po
+++ b/Localization/zh-Hant/OrchardCore.PublishLater.po
@@ -10,21 +10,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:19\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:13
+#. <button class="btn btn-outline-success text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.PublishLater">@T["Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:12
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Publish Later"
 msgstr ""
 
-#. <button class="btn btn-primary btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
-#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:18
+#. <button class="btn btn-warning text-nowrap btn-publish-later" type="submit" name="submit.Save" value="submit.CancelPublishLater">@T["Cancel Publish Later"]</button>
+#: OrchardCore.PublishLater\Views\PublishLaterPart.Edit.cshtml:19
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Edit"
 msgid "Cancel Publish Later"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.PublishLater\Views\PublishLaterPart.Option.cshtml:4
 msgctxt "OrchardCore.PublishLater.Views.PublishLaterPart.Option"
 msgid "Standard"
diff --git a/Localization/zh-Hant/OrchardCore.Queries.po b/Localization/zh-Hant/OrchardCore.Queries.po
index 4d768266e6f1b..6c1eb4b2e204b 100644
--- a/Localization/zh-Hant/OrchardCore.Queries.po
+++ b/Localization/zh-Hant/OrchardCore.Queries.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Queries\AdminMenu.cs:24
@@ -127,7 +127,7 @@ msgid "Run SQL Query"
 msgstr ""
 
 #. ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:100
+#: OrchardCore.Queries\Sql\Controllers\AdminController.cs:97
 msgctxt "OrchardCore.Queries.Sql.Controllers.AdminController"
 msgid "An error occurred while executing the SQL query: {0}"
 msgstr ""
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "SQL Query"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Template"
@@ -340,7 +340,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "The SQL query uses standard SQL92 syntax and is converted based on the actual database. Tables will be prefixed automatically."
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:32
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Parameters"
@@ -358,7 +358,7 @@ msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Query"
 msgstr ""
 
-#. <label asp-for="RawSql">@T["Final SQL Query"]</label>
+#. <label asp-for="RawSql" class="form-label">@T["Final SQL Query"]</label>
 #: OrchardCore.Queries\Views\Admin\Query.cshtml:52
 msgctxt "OrchardCore.Queries.Views.Admin.Query"
 msgid "Final SQL Query"
@@ -394,7 +394,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Buttons"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:4
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Name"
@@ -406,7 +406,7 @@ msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "The technical name of the query."
 msgstr ""
 
-#. <label asp-for="Schema">@T["Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Schema"]</label>
 #: OrchardCore.Queries\Views\Query.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Queries.Views.Query.Fields.Edit"
 msgid "Schema"
@@ -462,7 +462,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "If checked, you will have to manually declare variables for content item references like Content Picker Fields, Taxonomy Fields, Tags Fields, and List item IDs and replace them where needed in the recipe. Any reference to these content items will be lost."
 msgstr ""
 
-#. <label asp-for="QueryName">@T["Query"]</label>
+#. <label asp-for="QueryName" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:24
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Query"
@@ -474,7 +474,7 @@ msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.
 msgid "Note: The Query must be configured to return Documents."
 msgstr ""
 
-#. <label asp-for="QueryParameters">@T["Parameters"]</label>
+#. <label asp-for="QueryParameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Queries\Views\Items\QueryBasedContentDeploymentStep.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Queries.Views.Items.QueryBasedContentDeploymentStep.Fields.Edit"
 msgid "Parameters"
@@ -528,7 +528,7 @@ msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "When checked, the result has to be a list of document ids."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Queries\Views\SqlQuery.Edit.cshtml:21
 msgctxt "OrchardCore.Queries.Views.SqlQuery.Edit"
 msgid "Query"
diff --git a/Localization/zh-Hant/OrchardCore.ReCaptcha.Core.po b/Localization/zh-Hant/OrchardCore.ReCaptcha.Core.po
index dc74b1ab9b167..df80fcce0c08a 100644
--- a/Localization/zh-Hant/OrchardCore.ReCaptcha.Core.po
+++ b/Localization/zh-Hant/OrchardCore.ReCaptcha.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:20\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
 #: OrchardCore.ReCaptcha.Core\ActionFilters\ValidateReCaptchaAttribute.cs:44
@@ -18,15 +18,9 @@ msgctxt "OrchardCore.ReCaptcha.ActionFilters.ValidateReCaptchaAttribute"
 msgid "Failed to validate captcha"
 msgstr ""
 
-#. reportError("ReCaptcha", S["Failed to validate captcha"]);
-#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:96
+#. reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+#: OrchardCore.ReCaptcha.Core\Services\ReCaptchaService.cs:107
 msgctxt "OrchardCore.ReCaptcha.Services.ReCaptchaService"
-msgid "Failed to validate captcha"
-msgstr ""
-
-#. _logger.LogWarning(S["Language with name {0} not found", language]);
-#: OrchardCore.ReCaptcha.Core\TagHelpers\ReCaptchaTagHelper.cs:99
-msgctxt "OrchardCore.ReCaptcha.TagHelpers.ReCaptchaTagHelper"
-msgid "Language with name {0} not found"
+msgid "Failed to validate ReCaptcha"
 msgstr ""
 
diff --git a/Localization/zh-Hant/OrchardCore.ReCaptcha.po b/Localization/zh-Hant/OrchardCore.ReCaptcha.po
index de67a6b7ce065..12ffd3c946a7d 100644
--- a/Localization/zh-Hant/OrchardCore.ReCaptcha.po
+++ b/Localization/zh-Hant/OrchardCore.ReCaptcha.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:12\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Security"], security => security
 #: OrchardCore.ReCaptcha\AdminMenu.cs:26
@@ -45,37 +45,37 @@ msgid "Exports the ReCaptcha settings."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:29
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validate ReCaptcha Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Validation"];
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:33
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:31
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Validation"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:39
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:37
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Invalid"
 msgstr ""
 
-#. updater.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:52
+#. updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+#: OrchardCore.ReCaptcha\Workflows\ValidateReCaptchaTask.cs:49
 msgctxt "OrchardCore.ReCaptcha.Workflows.ValidateReCaptchaTask"
 msgid "Captcha validation failed. Try again."
 msgstr ""
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <label asp-for="SiteKey">@T["Site Key"]</label>
+#. <label asp-for="SiteKey" class="form-label">@T["Site Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:6
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Site Key"
@@ -114,7 +114,7 @@ msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Your Google's reCaptcha Site Key."
 msgstr ""
 
-#. <label asp-for="SecretKey">@T["Secret Key"]</label>
+#. <label asp-for="SecretKey" class="form-label">@T["Secret Key"]</label>
 #: OrchardCore.ReCaptcha\Views\ReCaptchaSettings.Edit.cshtml:13
 msgctxt "OrchardCore.ReCaptcha.Views.ReCaptchaSettings.Edit"
 msgid "Secret Key"
diff --git a/Localization/zh-Hant/OrchardCore.Recipes.Core.po b/Localization/zh-Hant/OrchardCore.Recipes.Core.po
index 8311c9defbe07..9f48bce2b5ec2 100644
--- a/Localization/zh-Hant/OrchardCore.Recipes.Core.po
+++ b/Localization/zh-Hant/OrchardCore.Recipes.Core.po
@@ -10,9 +10,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, _globalMethodName]);
+#. throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
 #: OrchardCore.Recipes.Core\VariablesMethodProvider.cs:30
 msgctxt "OrchardCore.Recipes.VariablesMethodProvider"
 msgid "The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe."
diff --git a/Localization/zh-Hant/OrchardCore.Roles.po b/Localization/zh-Hant/OrchardCore.Roles.po
index 9832c26822764..ed9aab05c3485 100644
--- a/Localization/zh-Hant/OrchardCore.Roles.po
+++ b/Localization/zh-Hant/OrchardCore.Roles.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Roles\AdminMenu.cs:24
@@ -26,13 +26,13 @@ msgctxt "OrchardCore.Roles.AdminMenu"
 msgid "Roles"
 msgstr "角色"
 
-#. ModelState.AddModelError(String.Empty, S["Invalid role name."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid role name."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:99
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Invalid role name."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The role is already used."]);
+#. ModelState.AddModelError(string.Empty, S["The role is already used."]);
 #: OrchardCore.Roles\Controllers\AdminController.cs:104
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "The role is already used."
@@ -62,7 +62,7 @@ msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "Role updated successfully."
 msgstr "已成功创建角色."
 
-#. var title = String.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+#. var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
 #: OrchardCore.Roles\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Roles.Controllers.AdminController"
 msgid "{0} Feature"
@@ -74,6 +74,54 @@ msgctxt "OrchardCore.Roles.Services.RoleStore"
 msgid "Can't delete system roles."
 msgstr "无法删除系统角色。"
 
+#. public override LocalizedString DisplayText => S["Get Users by Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:29
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Get Users by Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\GetUsersByRoleTask.cs:46
+msgctxt "OrchardCore.Roles.Workflows.Activities.GetUsersByRoleTask"
+msgid "Failed"
+msgstr ""
+
+#. public override LocalizedString DisplayText => S["Unassign User Role Task"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:31
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Unassign User Role Task"
+msgstr ""
+
+#. public override LocalizedString Category => S["User"];
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:33
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "User"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Done"
+msgstr ""
+
+#. => Outcomes(S["Done"], S["Failed"]);
+#: OrchardCore.Roles\Views\Workflows\Activities\UnassignUserRoleTask.cs:48
+msgctxt "OrchardCore.Roles.Workflows.Activities.UnassignUserRoleTask"
+msgid "Failed"
+msgstr ""
+
 #. <h5>@T["All Roles"]</h5>
 #: OrchardCore.Roles\Views\Items\AllRolesDeploymentStep.Edit.cshtml:3
 msgctxt "OrchardCore.Roles.Views.Items.AllRolesDeploymentStep.Edit"
@@ -110,13 +158,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Create Role"
 msgstr "创建角色"
 
-#. <label asp-for="RoleName">@T["Role name"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["Role name"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:9
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role name"
 msgstr "角色名称"
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Create.cshtml:15
 msgctxt "OrchardCore.Roles.Views.Admin.Create"
 msgid "Role description"
@@ -152,7 +200,7 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Edit Role Detail"
 msgstr ""
 
-#. <label asp-for="RoleDescription">@T["Role description"]</label>
+#. <label asp-for="RoleDescription" class="form-label">@T["Role description"]</label>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Role description"
@@ -198,13 +246,13 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Permission"
 msgstr "许可"
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."
 msgstr ""
 
-#. <span class="badge bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
+#. <span class="badge text-bg-danger" data-bs-toggle="tooltip" data-html="true" title="@T["This permission could allow a user to elevate their other permissions. Grant it with extreme consideration."]">@T["Security Critical"]</span>
 #: OrchardCore.Roles\Views\Admin\Edit.cshtml:63
 msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Security Critical"
@@ -222,6 +270,54 @@ msgctxt "OrchardCore.Roles.Views.Admin.Edit"
 msgid "Cancel"
 msgstr "取消"
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Get users in roles"])
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles"
+msgstr ""
+
+#. <em>@T["Get users in roles {0} to {1}", string.Join(',', Model.Activity.Roles), Model.Activity.OutputKeyName]</em>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Design"
+msgid "Get users in roles {0} to {1}"
+msgstr ""
+
+#. <label asp-for="OutputKeyName" class="form-label">@T["Output Key Name"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Output Key Name"
+msgstr ""
+
+#. <span class="hint">@T["The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "The designated key name for storing the users' list in the workflow output. This key enables later access to the list within the workflow.With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["Choose the roles used to identify users during list generation."]</span>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Edit"
+msgid "Choose the roles used to identify users during list generation."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Get users in roles"]
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles"
+msgstr ""
+
+#. <p>@T["Get users in roles."]</p>
+#: OrchardCore.Roles\Views\Items\GetUsersByRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.GetUsersByRoleTask.Fields.Thumbnail"
+msgid "Get users in roles."
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Roles"])</h1></zone>
 #: OrchardCore.Roles\Views\Admin\Index.cshtml:5
 msgctxt "OrchardCore.Roles.Views.Admin.Index"
@@ -275,3 +371,51 @@ msgctxt "OrchardCore.Roles.Views.NavigationItemText-roles.Id"
 msgid "Roles"
 msgstr ""
 
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Unassign user from roles"])
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:10
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <em>@T["Unassign {0} from roles {1}", Model.Activity.UserName, string.Join(",", Model.Activity.Roles)]</em>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Design.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Design"
+msgid "Unassign {0} from roles {1}"
+msgstr ""
+
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:6
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "UserName"
+msgstr ""
+
+#. <span class="hint">@T["The User to update. With Liquid support."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The User to update. With Liquid support."
+msgstr ""
+
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:13
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "Roles"
+msgstr ""
+
+#. <span class="hint">@T["The Roles to remove."]</span>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Edit"
+msgid "The Roles to remove."
+msgstr ""
+
+#. <i class="fa-solid fa-user" aria-hidden="true"></i>@T["Unassign user from roles"]
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign user from roles"
+msgstr ""
+
+#. <p>@T["Unassign a user from roles."]</p>
+#: OrchardCore.Roles\Views\Items\UnassignUserRoleTask.Fields.Thumbnail.cshtml:4
+msgctxt "OrchardCore.Roles.Views.Items.UnassignUserRoleTask.Fields.Thumbnail"
+msgid "Unassign a user from roles."
+msgstr ""
+
diff --git a/Localization/zh-Hant/OrchardCore.Rules.po b/Localization/zh-Hant/OrchardCore.Rules.po
index ecda9a4df0cdf..88481ceaa6f33 100644
--- a/Localization/zh-Hant/OrchardCore.Rules.po
+++ b/Localization/zh-Hant/OrchardCore.Rules.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. (S) => S["Equals"],
 #: OrchardCore.Rules\Services\ConditionOperatorConfigureOptions.cs:14
@@ -66,7 +66,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "All"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AllCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AllCondition.Fields.Edit"
 msgid "Name"
@@ -96,7 +96,7 @@ msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Any"
 msgstr ""
 
-#. <label asp-for="DisplayText">@T["Name"]</label>
+#. <label asp-for="DisplayText" class="form-label">@T["Name"]</label>
 #: OrchardCore.Rules\Views\Items\AnyCondition.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Rules.Views.Items.AnyCondition.Fields.Edit"
 msgid "Name"
@@ -180,7 +180,7 @@ msgctxt "OrchardCore.Rules.Views.Condition.Thumbnail"
 msgid "Add"
 msgstr ""
 
-#. <p class="alert message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
+#. <p class="alert alert-warning message-warning mb-0 ms-0 mt-3 me-3">@T["No conditions found. Please add at least one condition."]</p>
 #: OrchardCore.Rules\Views\Items\ConditionGroup.Fields.Summary.cshtml:19
 msgctxt "OrchardCore.Rules.Views.Items.ConditionGroup.Fields.Summary"
 msgid "No conditions found. Please add at least one condition."
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Content type"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Operation"
@@ -224,7 +224,7 @@ msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Select the rule operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\ContentTypeCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.ContentTypeCondition.Fields.Edit"
 msgid "Value"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Culture"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Operation"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\CultureCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.CultureCondition.Fields.Edit"
 msgid "Value"
@@ -398,7 +398,7 @@ msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Javascript"
 msgstr ""
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Rules\Views\Items\JavascriptCondition.Fields.Edit.cshtml:14
 msgctxt "OrchardCore.Rules.Views.Items.JavascriptCondition.Fields.Edit"
 msgid "Script"
@@ -434,7 +434,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Role"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Operation"
@@ -446,7 +446,7 @@ msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\RoleCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.RoleCondition.Fields.Edit"
 msgid "Value"
@@ -494,7 +494,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Url"
 msgstr ""
 
-#. <label asp-for="SelectedOperation">@T["Operation"]</label>
+#. <label asp-for="SelectedOperation" class="form-label">@T["Operation"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Operation"
@@ -506,7 +506,7 @@ msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Select the condition operator."
 msgstr ""
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Rules\Views\Items\UrlCondition.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Rules.Views.Items.UrlCondition.Fields.Edit"
 msgid "Value"
diff --git a/Localization/zh-Hant/OrchardCore.Search.Elasticsearch.po b/Localization/zh-Hant/OrchardCore.Search.Elasticsearch.po
index e3fcce387ece1..c14a1dfef1ef0 100644
--- a/Localization/zh-Hant/OrchardCore.Search.Elasticsearch.po
+++ b/Localization/zh-Hant/OrchardCore.Search.Elasticsearch.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:57\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], "7", search => search
 #: OrchardCore.Search.Elasticsearch\AdminMenu.cs:26
@@ -56,126 +56,126 @@ msgctxt "OrchardCore.Search.Elasticsearch.AdminMenu"
 msgid "Elasticsearch"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:129
+#. new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:139
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Reset"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:130
+#. new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:140
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Rebuild"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:131
+#. new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:141
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:199
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:206
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:213
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:242
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:245
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:247
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:253
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:267
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:273
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:272
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:281
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
+msgid "Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:294
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:517
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:303
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:523
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", _elasticIndexManager.GetFullIndexName(item.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:327
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:530
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:336
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:536
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:342
+#. await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:351
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index not found on Elasticsearch server."
 msgstr ""
 
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", _elasticIndexManager.GetFullIndexName(model.IndexName)]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:350
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:373
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:359
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:382
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:354
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:377
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:363
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:386
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:473
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:504
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:510
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:545
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:551
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "At least one content type selection is required."
+msgid "At least one content type is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:550
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:556
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
 msgid "The index name is required."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:554
+#. ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
+#: OrchardCore.Search.Elasticsearch\Controllers\AdminController.cs:560
 msgctxt "OrchardCore.Search.Elasticsearch.AdminController"
-msgid "The index name contains unallowed chars."
+msgid "The index name contains forbidden characters."
 msgstr ""
 
 #. updater.ModelState.AddModelError(nameof(model.Template), S["The query field is required"]);
@@ -190,7 +190,43 @@ msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticQueryDisplayDriver"
 msgid "The index field is required"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. new(S["Multi-Match Query (Default)"], string.Empty),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:61
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Multi-Match Query (Default)"
+msgstr ""
+
+#. new(S["Query String Query"], ElasticSettings.QueryStringSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:62
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Query String Query"
+msgstr ""
+
+#. new(S["Custom Query"], ElasticSettings.CustomSearchType),
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:63
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Custom Query"
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Please provide the default query."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:94
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Please provide the default query."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["The provided query is not formatted correctly."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:98
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "The provided query is not formatted correctly."
+msgstr ""
+
+#. context.Updater.ModelState.AddModelError(Prefix, nameof(model.DefaultQuery), S["Invalid query provided."]);
+#: OrchardCore.Search.Elasticsearch\Drivers\ElasticSettingsDisplayDriver.cs:112
+msgctxt "OrchardCore.Search.Elasticsearch.Drivers.ElasticSettingsDisplayDriver"
+msgid "Invalid query provided."
+msgstr ""
+
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ContentPickerFieldElasticEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ContentPickerFieldElasticEditorSettings.Edit"
 msgid "Index"
@@ -214,7 +250,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Edit Elasticsearch Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index Name"
@@ -234,7 +270,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "See documentation"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:21
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Analyzer Name"
@@ -246,7 +282,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Select an analyzer"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:29
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Culture"
@@ -264,7 +300,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:38
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Content Types"
@@ -276,7 +312,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Edit.cshtml:52
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Edit"
 msgid "Index options"
@@ -416,13 +452,13 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploym
 msgid "Rebuild Elasticsearch Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -470,7 +506,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymen
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Elasticsearch\Views\Items\ElasticIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Items.ElasticIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -494,7 +530,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Buttons.SummaryAdmi
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Index"
@@ -518,7 +554,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.Edit"
 msgid "Query"
@@ -536,52 +572,52 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticQuery.SummaryAdmin"
 msgid "Elasticsearch query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:6
+#. <div class="alert alert-warning">@T["No indices exist! Please create at least one index to configure Elasticsearch service."]</div>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default search index"
+msgid "No indices exist! Please create at least one index to configure Elasticsearch service."
 msgstr ""
 
-#. <span class="hint">@T["The default index to use for the search page."]</span>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "The default index to use for the search page."
+msgid "Default search index"
 msgstr ""
 
-#. <div class="alert alert-warning">@T["You need to create at least an index to set as the Search index."]</div>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:19
+#. <span class="hint">@T["The default index to use for the search page."]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "You need to create at least an index to set as the Search index."
+msgid "The default index to use for the search page."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:23
+#. <label asp-for="SearchType" class="form-label">@T["Default search type"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Default searched fields"
+msgid "Default search type"
 msgstr ""
 
-#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."]</span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:26
+#. <label asp-for="DefaultQuery" class="form-label">@T["Default query"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "A comma separated list of fields to use for search pages. The default value is <code>Content.ContentItem.FullText</code>."
+msgid "Default query"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="AllowElasticQueryStringQueryInSearch">@T["Allow Elasticsearch \"query string query\" in search forms"]</label>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:32
+#. <span class="hint">@T["Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term.", "{{ term }}"]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Allow Elasticsearch \"query string query\" in search forms"
+msgid "Create a custom Elasticsearch query to be utilized for each search request. Liquid is supported, so use <code>{0}</code> template as a substitute for the user-provided search term."
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."
+msgid "Default searched fields"
 msgstr ""
 
-#. <span class="hint dashed">@T["Whether search queries should be allowed to use <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query\">Elasticsearch \"query string query\" syntax</a>."] <a  class="seedoc" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-dsl-query-string-query" target="_blank">@T["See documentation"]</a></span>
-#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:33
+#. <span class="hint">@T["A comma separated list of fields to use for search pages. The default value is <code>{0}</code>.", IndexingConstants.FullTextKey]</span>
+#: OrchardCore.Search.Elasticsearch\Views\ElasticSettings.Edit.cshtml:42
 msgctxt "OrchardCore.Search.Elasticsearch.Views.ElasticSettings.Edit"
-msgid "See documentation"
+msgid "A comma separated list of fields to use for search pages. The default value is <code>{0}</code>."
 msgstr ""
 
 #. <h5>@T["Elasticsearch Settings"]</h5>
@@ -808,7 +844,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Elasticsearch index mappings"
 msgstr ""
 
-#. <label asp-for="Mappings">@T["Mappings for: "]@Model.IndexName</label>
+#. <label asp-for="Mappings" class="form-label">@T["Mappings for: "]@Model.IndexName</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Mappings.cshtml:8
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Mappings"
 msgid "Mappings for: "
@@ -850,7 +886,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Elasticsearch Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Index"
@@ -862,7 +898,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The Elasticsearch index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Template"
@@ -880,7 +916,7 @@ msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Elasticsearch\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Elasticsearch.Views.Admin.Query"
 msgid "Parameters"
diff --git a/Localization/zh-Hant/OrchardCore.Search.Lucene.po b/Localization/zh-Hant/OrchardCore.Search.Lucene.po
index 4718bf9402f6a..d93bb77df0961 100644
--- a/Localization/zh-Hant/OrchardCore.Search.Lucene.po
+++ b/Localization/zh-Hant/OrchardCore.Search.Lucene.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:58\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #: OrchardCore.Search.Lucene\AdminMenu.cs:26
@@ -57,121 +57,121 @@ msgid "Lucene"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Reset"], Value = nameof(ContentsBulkAction.Reset) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:128
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Reset"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Rebuild"], Value = nameof(ContentsBulkAction.Rebuild) },
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:129
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:131
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Rebuild"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(ContentsBulkAction.Remove) }
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:130
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:132
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
 #. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-#. .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:173
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:212
+#. }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:175
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:220
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Any culture"
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:198
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} already exists."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:205
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:207
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An index named {0} doesn't exist."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:230
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:238
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while creating the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:235
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:243
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> created successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:247
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:255
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while editing the index."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:252
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:260
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:281
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:457
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:289
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:465
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> reset successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:302
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:471
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:310
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:479
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> rebuilt successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:328
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:336
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Index <em>{0}</em> deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:332
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:340
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "An error occurred while deleting the index."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:412
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:420
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Invalid query : {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Indices successfully removed."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:444
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:452
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "Indices successfully removed."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:486
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:494
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "At least one content type selection is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:491
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:499
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name is required."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains unallowed chars."]);
-#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:495
+#: OrchardCore.Search.Lucene\Controllers\AdminController.cs:503
 msgctxt "OrchardCore.Search.Lucene.Controllers.AdminController"
 msgid "The index name contains unallowed chars."
 msgstr ""
@@ -196,7 +196,7 @@ msgctxt "OrchardCore.Search.Lucene.LuceneContentPickerShapeProvider"
 msgid "Lucene"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\ContentPickerFieldLuceneEditorSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.ContentPickerFieldLuceneEditorSettings.Edit"
 msgid "Index"
@@ -220,19 +220,19 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Edit Lucene Index"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index Name"
 msgstr ""
 
-#. <label asp-for="AnalyzerName">@T["Analyzer Name"]</label>
+#. <label asp-for="AnalyzerName" class="form-label">@T["Analyzer Name"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Analyzer Name"
 msgstr ""
 
-#. <label asp-for="Culture">@T["Culture"]</label>
+#. <label asp-for="Culture" class="form-label">@T["Culture"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Culture"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content culture that it will index."
 msgstr ""
 
-#. <label asp-for="IndexedContentTypes">@T["Content Types"]</label>
+#. <label asp-for="IndexedContentTypes" class="form-label">@T["Content Types"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:33
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Content Types"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "The content types to index. Choose at least one."
 msgstr ""
 
-#. <label asp-for="IndexLatest">@T["Index options"]</label>
+#. <label asp-for="IndexLatest" class="form-label">@T["Index options"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Edit.cshtml:47
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Edit"
 msgid "Index options"
@@ -518,13 +518,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.
 msgid "Lucene Search Indexes"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -566,13 +566,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.
 msgid "Rebuild Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexRebuildDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexRebuildDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fi
 msgid "Reset Lucene Search Indices"
 msgstr ""
 
-#. <span class="badge bg-success">@T["All"]</span>
+#. <span class="badge text-bg-success">@T["All"]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:15
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "All"
 msgstr ""
 
-#. <span class="badge bg-warning">@T["No index selected."]</span>
+#. <span class="badge text-bg-warning">@T["No index selected."]</span>
 #: OrchardCore.Search.Lucene\Views\Items\LuceneIndexResetDeploymentStep.Fields.Summary.cshtml:26
 msgctxt "OrchardCore.Search.Lucene.Views.Items.LuceneIndexResetDeploymentStep.Fields.Summary"
 msgid "No index selected."
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Buttons.SummaryAdmin"
 msgid "Run"
 msgstr ""
 
-#. <label asp-for="Index">@T["Index"]</label>
+#. <label asp-for="Index" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:8
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Index"
@@ -668,7 +668,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Check to return the corresponding content items."
 msgstr ""
 
-#. <label asp-for="Query">@T["Query"]</label>
+#. <label asp-for="Query" class="form-label">@T["Query"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneQuery.Edit.cshtml:27
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.Edit"
 msgid "Query"
@@ -686,7 +686,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneQuery.SummaryAdmin"
 msgid "Lucene query"
 msgstr ""
 
-#. <label asp-for="SearchIndex">@T["Default search index"]</label>
+#. <label asp-for="SearchIndex" class="form-label">@T["Default search index"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default search index"
@@ -710,7 +710,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "You need to create at least an index to set as the Search index."
 msgstr ""
 
-#. <label asp-for="SearchFields">@T["Default searched fields"]</label>
+#. <label asp-for="SearchFields" class="form-label">@T["Default searched fields"]</label>
 #: OrchardCore.Search.Lucene\Views\LuceneSettings.Edit.cshtml:24
 msgctxt "OrchardCore.Search.Lucene.Views.LuceneSettings.Edit"
 msgid "Default searched fields"
@@ -800,7 +800,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Lucene Query"
 msgstr ""
 
-#. <label asp-for="IndexName">@T["Index"]</label>
+#. <label asp-for="IndexName" class="form-label">@T["Index"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:23
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Index"
@@ -812,7 +812,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The lucene index to search on"
 msgstr ""
 
-#. <label asp-for="DecodedQuery">@T["Template"]</label>
+#. <label asp-for="DecodedQuery" class="form-label">@T["Template"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:34
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Template"
@@ -830,7 +830,7 @@ msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The search query uses the Elasticsearch format. Some documentation can be found here <a target=\"_blank\" href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html\">https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html</a>"
 msgstr ""
 
-#. <label asp-for="Parameters">@T["Parameters"]</label>
+#. <label asp-for="Parameters" class="form-label">@T["Parameters"]</label>
 #: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:41
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "Parameters"
@@ -861,7 +861,7 @@ msgid "Create"
 msgstr ""
 
 #. <p><span class="text-muted">@T["The results displayed are coming from the stored fields in Lucene."]</span></p>
-#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:91
+#: OrchardCore.Search.Lucene\Views\Admin\Query.cshtml:93
 msgctxt "OrchardCore.Search.Lucene.Views.Admin.Query"
 msgid "The results displayed are coming from the stored fields in Lucene."
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Search.po b/Localization/zh-Hant/OrchardCore.Search.po
index e967528f8a409..616b11da8090b 100644
--- a/Localization/zh-Hant/OrchardCore.Search.po
+++ b/Localization/zh-Hant/OrchardCore.Search.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:30\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
 #. .Add(S["Search"], S["Search"].PrefixPosition(), entry => entry
@@ -57,7 +57,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart"
 msgid "Search"
 msgstr ""
 
-#. <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Placeholder"
@@ -69,7 +69,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "The placeholder text to use in the search bar."
 msgstr ""
 
-#. <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
+#. <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
 #: OrchardCore.Search\Views\SearchFormPart.Edit.cshtml:14
 msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Index Name"
@@ -81,7 +81,7 @@ msgctxt "OrchardCore.Search.Views.SearchFormPart.Edit"
 msgid "Leave it empty to use the default index."
 msgstr ""
 
-#. <label asp-for="ProviderName">@T["Default search provider"]</label>
+#. <label asp-for="ProviderName" class="form-label">@T["Default search provider"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Default search provider"
@@ -93,7 +93,7 @@ msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "The default search provider to use for the search page."
 msgstr ""
 
-#. <label asp-for="Placeholder">@T["Placeholder"]</label>
+#. <label asp-for="Placeholder" class="form-label">@T["Placeholder"]</label>
 #: OrchardCore.Search\Views\SearchSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Search.Views.SearchSettings.Edit"
 msgid "Placeholder"
diff --git a/Localization/zh-Hant/OrchardCore.Security.po b/Localization/zh-Hant/OrchardCore.Security.po
index 5a9f54b56c00f..d54ddd233a68a 100644
--- a/Localization/zh-Hant/OrchardCore.Security.po
+++ b/Localization/zh-Hant/OrchardCore.Security.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-01-12 21:32\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Security\AdminMenu.cs:22
@@ -44,7 +44,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "The current settings are coming from configuration sources, saving the settings will affect the AdminSettings not the configuration."
 msgstr ""
 
-#. <label asp-for="ContentSecurityPolicy">@T["Content Security Policy"]</label>
+#. <label asp-for="ContentSecurityPolicy" class="form-label">@T["Content Security Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:176
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Content Security Policy"
@@ -82,7 +82,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows administrators to control resources the user agent is allowed to load for a given page."
 msgstr ""
 
-#. <label asp-for="PermissionsPolicy">@T["Permissions Policy"]</label>
+#. <label asp-for="PermissionsPolicy" class="form-label">@T["Permissions Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:216
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Permissions Policy"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Allows a site to control which features and APIs can be used in the browser."
 msgstr ""
 
-#. <label asp-for="ReferrerPolicy">@T["Referrer Policy"]</label>
+#. <label asp-for="ReferrerPolicy" class="form-label">@T["Referrer Policy"]</label>
 #: OrchardCore.Security\Views\SecurityHeadersSettings.Edit.cshtml:274
 msgctxt "OrchardCore.Security.Views.SecurityHeadersSettings.Edit"
 msgid "Referrer Policy"
diff --git a/Localization/zh-Hant/OrchardCore.Seo.po b/Localization/zh-Hant/OrchardCore.Seo.po
index 98e31ff54e94b..af0984a7b0afb 100644
--- a/Localization/zh-Hant/OrchardCore.Seo.po
+++ b/Localization/zh-Hant/OrchardCore.Seo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-15 20:31\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Seo\AdminMenu.cs:25
@@ -88,7 +88,7 @@ msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Add a rule to disallow web robots to the admin routes."
 msgstr ""
 
-#. <label asp-for="AdditionalRules">@T["Additional rules"]</label>
+#. <label asp-for="AdditionalRules" class="form-label">@T["Additional rules"]</label>
 #: OrchardCore.Seo\Views\RobotsSettings.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.RobotsSettings.Edit"
 msgid "Additional rules"
@@ -112,7 +112,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Whether to render metadata for this page."
 msgstr ""
 
-#. <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
+#. <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:17
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Page Title"
@@ -124,7 +124,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default generated web browser page title (recommended to keep under 70 characters)."
 msgstr ""
 
-#. <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
+#. <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:25
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Description"
@@ -136,7 +136,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta description to render for this page."
 msgstr ""
 
-#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
+#. <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:35
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Keywords"
@@ -148,7 +148,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "The meta keywords to render for this page, comma separated."
 msgstr ""
 
-#. <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
+#. <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:44
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Canonical"
@@ -160,7 +160,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Override the default canonical url."
 msgstr ""
 
-#. <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
+#. <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:52
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Meta Robots"
@@ -222,8 +222,8 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Edit Data"
 msgstr ""
 
-#. <label for="meta-tags-textarea">@T["Custom Meta Tags"]</label>
-#. <label asp-for="CustomMetaTags">@T["Custom Meta Tags"]</label>
+#. <label for="meta-tags-textarea" class="form-label">@T["Custom Meta Tags"]</label>
+#. <label asp-for="CustomMetaTags" class="form-label">@T["Custom Meta Tags"]</label>
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:125
 #: OrchardCore.Seo\Views\SeoMetaPart.Edit.cshtml:140
 msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
@@ -248,7 +248,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPart.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="GoogleSchema">@T["Google Schema"] </label>
+#. <label asp-for="GoogleSchema" class="form-label">@T["Google Schema"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartGoogleSchema.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "Google Schema"
@@ -260,7 +260,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartGoogleSchema.Edit"
 msgid "The Social Meta Settings Google Schema is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphType">@T["Open Graph Type"] </label>
+#. <label asp-for="OpenGraphType" class="form-label">@T["Open Graph Type"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Type"
@@ -272,7 +272,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Social Meta Settings Open Graph Type is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphTitle">@T["Open Graph Title"] </label>
+#. <label asp-for="OpenGraphTitle" class="form-label">@T["Open Graph Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Title"
@@ -284,7 +284,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="OpenGraphDescription">@T["Open Graph Description"] </label>
+#. <label asp-for="OpenGraphDescription" class="form-label">@T["Open Graph Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartOpenGraph.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartOpenGraph.Edit"
 msgid "Open Graph Description"
@@ -356,7 +356,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartSettings.Edit"
 msgid "Check to display the Google Schema panel."
 msgstr ""
 
-#. <label asp-for="TwitterTitle">@T["Twitter Title"] </label>
+#. <label asp-for="TwitterTitle" class="form-label">@T["Twitter Title"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:4
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Title"
@@ -368,7 +368,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Title is used by default, then the Page Title, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterDescription">@T["Twitter Description"] </label>
+#. <label asp-for="TwitterDescription" class="form-label">@T["Twitter Description"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:10
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Description"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Meta Description is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCard">@T["Twitter Card"] </label>
+#. <label asp-for="TwitterCard" class="form-label">@T["Twitter Card"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:16
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Card"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Card is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterCreator">@T["Twitter Creator"] </label>
+#. <label asp-for="TwitterCreator" class="form-label">@T["Twitter Creator"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:22
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Creator"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "The Social Meta Settings Twitter Creator is used by default, or can be overridden here."
 msgstr ""
 
-#. <label asp-for="TwitterSite">@T["Twitter Site"] </label>
+#. <label asp-for="TwitterSite" class="form-label">@T["Twitter Site"] </label>
 #: OrchardCore.Seo\Views\SeoMetaPartTwitter.Edit.cshtml:28
 msgctxt "OrchardCore.Seo.Views.SeoMetaPartTwitter.Edit"
 msgid "Twitter Site"
diff --git a/Localization/zh-Hant/OrchardCore.Settings.po b/Localization/zh-Hant/OrchardCore.Settings.po
index d5165a7d2b586..609c8fa8e7b3d 100644
--- a/Localization/zh-Hant/OrchardCore.Settings.po
+++ b/Localization/zh-Hant/OrchardCore.Settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
 #: OrchardCore.Settings\AdminMenu.cs:26
@@ -37,19 +37,19 @@ msgid "Site settings updated successfully."
 msgstr "網站設定更新成功"
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:71
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:79
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be greater than zero."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:76
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:84
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The page size must be less than or equal to {0}."
 msgstr ""
 
 #. context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:82
+#: OrchardCore.Settings\Drivers\DefaultSiteSettingsDisplayDriver.cs:90
 msgctxt "OrchardCore.Settings.Drivers.DefaultSiteSettingsDisplayDriver"
 msgid "The Base url must be a fully qualified URL."
 msgstr ""
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Settings for dynamic caches"
 msgstr ""
 
-#. <label asp-for="CacheMode">@T["Cache Mode"]</label>
+#. <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Cache.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Cache.Edit"
 msgid "Cache Mode"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"
 msgstr ""
 
-#. <label asp-for="CdnBaseUrl">@T["Site CDN (Content Delivery Network) base url"]</label>
+#. <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:22
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Site CDN (Content Delivery Network) base url"
@@ -168,7 +168,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. <em>https://cdn.mysite.com</em>"
 msgstr ""
 
-#. <label asp-for="ResourceDebugMode">@T["Resource Debug Mode"]</label>
+#. <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
 #: OrchardCore.Settings\Views\Settings-Resources.Edit.cshtml:30
 msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Resource Debug Mode"
@@ -198,7 +198,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Resources.Edit"
 msgid "Determines whether scripts and stylesheets load in their debuggable or minified form."
 msgstr ""
 
-#. <label asp-for="SiteName">@T["Site name"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["Site name"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:7
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Site name"
@@ -210,7 +210,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The site name."
 msgstr ""
 
-#. <label asp-for="PageTitleFormat">@T["Page title format"]</label>
+#. <label asp-for="PageTitleFormat" class="form-label">@T["Page title format"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:14
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page title format"
@@ -222,7 +222,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "The default format of page titles."
 msgstr ""
 
-#. <label asp-for="BaseUrl">@T["Base url"]</label>
+#. <label asp-for="BaseUrl" class="form-label">@T["Base url"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:21
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Base url"
@@ -234,7 +234,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Enter the fully qualified base URL of the web site."
 msgstr ""
 
-#. <label asp-for="TimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:29
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Default Time Zone"
@@ -252,7 +252,7 @@ msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Determines the default time zone used when displaying and editing dates and times. DST (daylight saving time) will be applied automatically per time zone if available."
 msgstr ""
 
-#. <label asp-for="PageSize">@T["Page size"]</label>
+#. <label asp-for="PageSize" class="form-label">@T["Page size"]</label>
 #: OrchardCore.Settings\Views\Settings-Site.Edit.cshtml:46
 msgctxt "OrchardCore.Settings.Views.Settings-Site.Edit"
 msgid "Page size"
@@ -294,7 +294,7 @@ msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summ
 msgid "Site Settings"
 msgstr "網站設定"
 
-#. <span class="badge bg-warning">@T["No settings selected."]</span>
+#. <span class="badge text-bg-warning">@T["No settings selected."]</span>
 #: OrchardCore.Settings\Views\Items\SiteSettingsDeploymentStep.Fields.Summary.cshtml:18
 msgctxt "OrchardCore.Settings.Views.Items.SiteSettingsDeploymentStep.Fields.Summary"
 msgid "No settings selected."
diff --git a/Localization/zh-Hant/OrchardCore.Setup.Core.po b/Localization/zh-Hant/OrchardCore.Setup.Core.po
index b683840de21d9..7a7a1c7d5bccb 100644
--- a/Localization/zh-Hant/OrchardCore.Setup.Core.po
+++ b/Localization/zh-Hant/OrchardCore.Setup.Core.po
@@ -10,33 +10,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
-#. context.Errors.Add(String.Empty, S["DatabaseProvider setting is required."]);
+#. context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
 #: OrchardCore.Setup.Core\SetupService.cs:168
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "DatabaseProvider setting is required."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database provider is not supported."]);
+#. context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
 #: OrchardCore.Setup.Core\SetupService.cs:171
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database provider is not supported."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
+#. context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
 #: OrchardCore.Setup.Core\SetupService.cs:174
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["The provided database, table prefix and schema are already in use."]);
+#. context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
 #: OrchardCore.Setup.Core\SetupService.cs:177
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
 
-#. context.Errors.Add(String.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
+#. context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
 #: OrchardCore.Setup.Core\SetupService.cs:210
 msgctxt "OrchardCore.Setup.Services.SetupService"
 msgid "An error occurred while initializing the datastore: {0}"
diff --git a/Localization/zh-Hant/OrchardCore.Setup.po b/Localization/zh-Hant/OrchardCore.Setup.po
index 702871837698b..4ba70de69748f 100644
--- a/Localization/zh-Hant/OrchardCore.Setup.po
+++ b/Localization/zh-Hant/OrchardCore.Setup.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
 #: OrchardCore.Setup\Controllers\SetupController.cs:105
@@ -95,7 +95,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password must have at least {0}."
 msgstr "密碼至少要有 {0} 個字元"
 
-#. <label for="culturesList" class="mt-2">@T["Change language"]</label>
+#. <label for="culturesList" class="form-label mt-2">@T["Change language"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:79
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Change language"
@@ -125,7 +125,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "It is not possible to set up a site without a recipe."
 msgstr "因為沒有配方導致網站設定失敗。"
 
-#. <label asp-for="SiteName">@T["What is the name of your site?"]</label>
+#. <label asp-for="SiteName" class="form-label">@T["What is the name of your site?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:109
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What is the name of your site?"
@@ -137,7 +137,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "This is used as the default title of your pages."
 msgstr "這個是網頁的預設標題。"
 
-#. <label asp-for="RecipeName">@T["Recipe"]</label>
+#. <label asp-for="RecipeName" class="form-label">@T["Recipe"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:121
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipe"
@@ -157,7 +157,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box."
 msgstr "配方是用來預先設定選項、功能和系統參數。"
 
-#. <label asp-for="SiteTimeZone">@T["Default Time Zone"]</label>
+#. <label asp-for="SiteTimeZone" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:150
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Default Time Zone"
@@ -169,7 +169,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Determines the default time zone used when displaying and editing dates and times."
 msgstr "設定預設時區是用來顯示和編輯時間資料用的。"
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:167
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "What type of database to use?"
@@ -187,7 +187,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The database is used to store the site's configuration and its contents."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:179
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Prefix"
@@ -199,7 +199,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "You can specify a table prefix if you intend to reuse the same database for multiple sites."
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:188
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Connection string"
@@ -211,7 +211,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Show/hide connection string"
 msgstr "顯示 / 隱藏連接字串"
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:200
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Table Schema"
@@ -241,13 +241,13 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The super user has all the rights. It should be used only during Setup and for disaster recovery."
 msgstr "管理者有所有的權限，建議這個帳號只用在設定和災難復原的時候使用。"
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:212
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "User name"
 msgstr "使用者名稱"
 
-#. <label for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:217
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Email"
@@ -259,7 +259,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "The email is invalid."
 msgstr "無效的電子郵件"
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:224
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password"
@@ -271,7 +271,7 @@ msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password strength"
 msgstr "密碼強度"
 
-#. <label asp-for="PasswordConfirmation">@T["Password Confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="form-label">@T["Password Confirmation"]</label>
 #: OrchardCore.Setup\Views\Setup\Index.cshtml:234
 msgctxt "OrchardCore.Setup.Views.Setup.Index"
 msgid "Password Confirmation"
diff --git a/Localization/zh-Hant/OrchardCore.Shortcodes.po b/Localization/zh-Hant/OrchardCore.Shortcodes.po
index 4c5143260399b..05ff41abd144a 100644
--- a/Localization/zh-Hant/OrchardCore.Shortcodes.po
+++ b/Localization/zh-Hant/OrchardCore.Shortcodes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:46\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Shortcodes\AdminMenu.cs:25
@@ -64,8 +64,8 @@ msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "The template content is mandatory."
 msgstr ""
 
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
-#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+#. ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:155
 #: OrchardCore.Shortcodes\Controllers\AdminController.cs:252
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
@@ -73,13 +73,13 @@ msgid "The template doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:302
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:306
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-#: OrchardCore.Shortcodes\Controllers\AdminController.cs:329
+#: OrchardCore.Shortcodes\Controllers\AdminController.cs:333
 msgctxt "OrchardCore.Shortcodes.Controllers.AdminController"
 msgid "Shortcode templates successfully removed."
 msgstr ""
@@ -120,7 +120,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Create Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:44
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Name"
@@ -132,7 +132,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:51
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Hint"
@@ -144,7 +144,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:57
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Usage"
@@ -156,7 +156,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:64
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Categories"
@@ -200,7 +200,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:90
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Default Shortcode Value"
@@ -212,7 +212,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Create.cshtml:107
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Create"
 msgid "Content"
@@ -254,7 +254,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Edit Shortcode"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:48
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Name"
@@ -266,7 +266,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The name of the shortcode."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:54
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Hint"
@@ -278,7 +278,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The hint for the shortcode."
 msgstr ""
 
-#. <label asp-for="Usage">@T["Usage"]</label>
+#. <label asp-for="Usage" class="form-label">@T["Usage"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:60
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Usage"
@@ -290,7 +290,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Example usage of the shortcode."
 msgstr ""
 
-#. <label asp-for="SelectedCategories">@T["Categories"]</label>
+#. <label asp-for="SelectedCategories" class="form-label">@T["Categories"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:67
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Categories"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The categories for this shortcode."
 msgstr ""
 
-#. <label asp-for="DefaultValue">@T["Default Shortcode Value"]</label>
+#. <label asp-for="DefaultValue" class="form-label">@T["Default Shortcode Value"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:93
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Default Shortcode Value"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "The default value of the shortcode when selected. Defaults to [name]."
 msgstr ""
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Shortcodes\Views\Admin\Edit.cshtml:116
 msgctxt "OrchardCore.Shortcodes.Views.Admin.Edit"
 msgid "Content"
diff --git a/Localization/zh-Hant/OrchardCore.Sitemaps.po b/Localization/zh-Hant/OrchardCore.Sitemaps.po
index 9a7632081c09e..4623a74ee5504 100644
--- a/Localization/zh-Hant/OrchardCore.Sitemaps.po
+++ b/Localization/zh-Hant/OrchardCore.Sitemaps.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Sitemaps\AdminMenu.cs:24
@@ -248,13 +248,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:13
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Create.cshtml:19
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Create"
 msgid "Permalink"
@@ -302,13 +302,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Permalink"
@@ -332,7 +332,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Create.cshtml:39
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Create"
 msgid "Contained Sitemaps"
@@ -380,7 +380,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Sitemap Custom Path"
 msgstr ""
 
-#. <label asp-for="Path">@T["Path"] </label>
+#. <label asp-for="Path" class="form-label">@T["Path"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:10
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Path"
@@ -392,7 +392,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The path to add to the sitemap. e.g. path/to/something"
 msgstr ""
 
-#. <label asp-for="ChangeFrequency">@T["Change Frequency"] </label>
+#. <label asp-for="ChangeFrequency" class="form-label">@T["Change Frequency"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:22
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Change Frequency"
@@ -404,7 +404,7 @@ msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "The default frequency with which this path is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority">@T["Priority"] </label>
+#. <label asp-for="Priority" class="form-label">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\CustomPathSitemapSource.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.CustomPathSitemapSource.Edit"
 msgid "Priority"
@@ -560,13 +560,13 @@ msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:14
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\Admin\Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.Admin.Edit"
 msgid "Permalink"
@@ -614,13 +614,13 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "The site settings 'Base url' property is empty, but is required to generate sitemaps."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:15
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Name"
 msgstr ""
 
-#. <label asp-for="Path">@T["Permalink"]</label>
+#. <label asp-for="Path" class="form-label">@T["Permalink"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:21
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Permalink"
@@ -644,7 +644,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Uncheck to disable routing to the sitemap index."
 msgstr ""
 
-#. <label asp-for="ContainableSitemaps">@T["Contained Sitemaps"]</label>
+#. <label asp-for="ContainableSitemaps" class="form-label">@T["Contained Sitemaps"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapIndex\Edit.cshtml:40
 msgctxt "OrchardCore.Sitemaps.Views.SitemapIndex.Edit"
 msgid "Contained Sitemaps"
@@ -1016,7 +1016,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Check to exclude this content item from the site map."
 msgstr ""
 
-#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
+#. <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:20
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Change Frequency"
@@ -1028,7 +1028,7 @@ msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "The frequency this content item is likely to change."
 msgstr ""
 
-#. <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
+#. <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
 #: OrchardCore.Sitemaps\Views\SitemapPart.Edit.cshtml:27
 msgctxt "OrchardCore.Sitemaps.Views.SitemapPart.Edit"
 msgid "Priority"
diff --git a/Localization/zh-Hant/OrchardCore.Sms.po b/Localization/zh-Hant/OrchardCore.Sms.po
index dfefc58955c63..855e15e64087d 100644
--- a/Localization/zh-Hant/OrchardCore.Sms.po
+++ b/Localization/zh-Hant/OrchardCore.Sms.po
@@ -10,10 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-21 15:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["SMS Task"];
-#: OrchardCore.Sms\Activities\SmsTask.cs:33
+#: OrchardCore.Sms\Activities\SmsTask.cs:32
 msgctxt "OrchardCore.Sms.Activities.SmsTask"
 msgid "SMS Task"
 msgstr ""
@@ -104,7 +104,7 @@ msgctxt "OrchardCore.Sms.Views.NavigationItemText-sms.Id"
 msgid "SMS"
 msgstr ""
 
-#. <label asp-for="DefaultProvider">@T["Default SMS provider"]</label>
+#. <label asp-for="DefaultProvider" class="form-label">@T["Default SMS provider"]</label>
 #: OrchardCore.Sms\Views\SmsSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.SmsSettings.Edit"
 msgid "Default SMS provider"
@@ -122,7 +122,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Design"
 msgid "Send SMS"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone Number"
@@ -134,7 +134,7 @@ msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Sms\Views\Items\SmsTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Sms.Views.Items.SmsTask.Fields.Edit"
 msgid "Body"
@@ -164,7 +164,7 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Twilio Account Info"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:10
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone Number"
@@ -176,21 +176,21 @@ msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Phone number must include a country code. For example, +1 for United States."
 msgstr ""
 
-#. <label asp-for="AccountSID">@T["Account SID"]</label>
+#. <label asp-for="AccountSID" class="form-label">@T["Account SID"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:17
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Account SID"
 msgstr ""
 
-#. <label asp-for="AuthToken">@T["Auth Token"]</label>
+#. <label asp-for="AuthToken" class="form-label">@T["Auth Token"]</label>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
 msgid "Auth Token"
 msgstr ""
 
-#. <span class="hint">@T["Auth token was securly saved. Enter a new value if you wish to replace the existing secret."]</span>
+#. <span class="hint">@T["Auth token was securely saved. Enter a new value if you wish to replace the existing secret."]</span>
 #: OrchardCore.Sms\Views\TwilioSettings.Edit.cshtml:28
 msgctxt "OrchardCore.Sms.Views.TwilioSettings.Edit"
-msgid "Auth token was securly saved. Enter a new value if you wish to replace the existing secret."
+msgid "Auth token was securely saved. Enter a new value if you wish to replace the existing secret."
 msgstr ""
 
diff --git a/Localization/zh-Hant/OrchardCore.Spatial.po b/Localization/zh-Hant/OrchardCore.Spatial.po
index c227eed5712b2..bb37dd77cabdf 100644
--- a/Localization/zh-Hant/OrchardCore.Spatial.po
+++ b/Localization/zh-Hant/OrchardCore.Spatial.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-17 17:03\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
 #. updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
@@ -36,13 +36,13 @@ msgctxt "OrchardCore.Spatial.Handlers.GeoPointFieldHandler"
 msgid "The {0} field is required."
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:11
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField-Leaflet.Edit.cshtml:19
 msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Edit"
 msgid "Longitude"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointField-Leaflet.Option"
 msgid "Leaflet editor"
 msgstr ""
 
-#. <label asp-for="Latitude">@T["Latitude"]</label>
+#. <label asp-for="Latitude" class="form-label">@T["Latitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:15
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Latitude"
 msgstr ""
 
-#. <label asp-for="Longitude">@T["Longitude"]</label>
+#. <label asp-for="Longitude" class="form-label">@T["Longitude"]</label>
 #: OrchardCore.Spatial\Views\GeoPointField.Edit.cshtml:23
 msgctxt "OrchardCore.Spatial.Views.GeoPointField.Edit"
 msgid "Longitude"
@@ -84,7 +84,7 @@ msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Whether a value is required."
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Spatial\Views\GeoPointFieldSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Spatial.Views.GeoPointFieldSettings.Edit"
 msgid "Hint"
diff --git a/Localization/zh-Hant/OrchardCore.Taxonomies.po b/Localization/zh-Hant/OrchardCore.Taxonomies.po
index e0008b801e61b..b56e449e26e88 100644
--- a/Localization/zh-Hant/OrchardCore.Taxonomies.po
+++ b/Localization/zh-Hant/OrchardCore.Taxonomies.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:48\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Configuration"], configuration => configuration
 #: OrchardCore.Taxonomies\AdminMenu.cs:25
@@ -62,6 +62,12 @@ msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyFieldTagsDisplayDriver"
 msgid "A value is required for '{0}'"
 msgstr ""
 
+#. updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+#: OrchardCore.Taxonomies\Drivers\TaxonomyPartDisplayDriver.cs:56
+msgctxt "OrchardCore.Taxonomies.Drivers.TaxonomyPartDisplayDriver"
+msgid "The Term Content Type field is required."
+msgstr ""
+
 #. context.Fail(S["A value is required for '{0}'", context.ContentPartFieldDefinition.DisplayName()], nameof(field.TermContentItemIds));
 #: OrchardCore.Taxonomies\Handlers\TaxonomyFieldHandler.cs:25
 msgctxt "OrchardCore.Taxonomies.Handlers.TaxonomyFieldHandler"
@@ -128,7 +134,7 @@ msgctxt "OrchardCore.Taxonomies.Views.NavigationItemText-taxonomyfilters.Id"
 msgid "Taxonomy Filters"
 msgstr ""
 
-#. <label asp-for="TaxonomyEntries">@T["Taxonomies"]</label>
+#. <label asp-for="TaxonomyEntries" class="form-label">@T["Taxonomies"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyContentsAdminListSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyContentsAdminListSettings.Edit"
 msgid "Taxonomies"
@@ -147,45 +153,45 @@ msgid "Tags"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:42
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:41
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr ""
 
 #. <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:47
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Error creating tag"
 msgstr ""
 
 #. placeholder="@T["Type to search"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:52
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Type to search"
 msgstr ""
 
 #. select-label="@T["Select"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Select"
 msgstr ""
 
 #. deselect-label="@T["Remove"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:55
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Remove"
 msgstr ""
 
 #. tag-placeholder="@T["Press enter to create a tag"]"
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:67
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:66
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "Press enter to create a tag"
 msgstr ""
 
 #. @T["No tags found"]
 #. @T["No tags found"]
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:70
-#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:73
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:69
+#: OrchardCore.Taxonomies\Views\TaxonomyField-Tags.Edit.cshtml:72
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Edit"
 msgid "No tags found"
 msgstr ""
@@ -196,25 +202,25 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField-Tags.Option"
 msgid "Tags"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.DisplayOption"
 msgid "Standard"
 msgstr ""
 
 #. @T["The taxonomy could not be found. Please check the settings for this field."]
-#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:24
+#: OrchardCore.Taxonomies\Views\TaxonomyField.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Edit"
 msgid "The taxonomy could not be found. Please check the settings for this field."
 msgstr "找不到分类。请检查此字段的设置。"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Taxonomies\Views\TaxonomyField.Option.cshtml:4
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyField.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Hint">@T["Hint"]</label>
+#. <label asp-for="Hint" class="form-label">@T["Hint"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:15
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Hint"
@@ -226,44 +232,50 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "The hint text to display for this field on the editor."
 msgstr "编辑器中显示此字段的提示文字。"
 
-#. <label asp-for="TaxonomyContentItemId">@T["Taxonomy"]</label>
+#. <label asp-for="TaxonomyContentItemId" class="form-label">@T["Taxonomy"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:23
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Taxonomy"
 msgstr "分类"
 
+#. <option value="">@T["Select a Taxonomy"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:25
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
+msgid "Select a Taxonomy"
+msgstr ""
+
 #. <label class="form-check-label" asp-for="Required">@T["Required"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:36
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Required"
 msgstr "必填"
 
 #. <span class="hint dashed">@T["Whether at least one element is selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:37
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:38
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether at least one element is selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="Unique">@T["Unique"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:44
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Unique"
 msgstr "唯一"
 
 #. <span class="hint dashed">@T["Whether only one element can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:45
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:46
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether only one element can be selected."
 msgstr ""
 
 #. <label class="form-check-label" asp-for="LeavesOnly">@T["Leaves only"]</label>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:52
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Leaves only"
 msgstr "仅限叶子"
 
 #. <span class="hint dashed">@T["Whether leaves are the only items that can be selected."]</span>
-#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:53
+#: OrchardCore.Taxonomies\Views\TaxonomyFieldSettings.Edit.cshtml:54
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldSettings.Edit"
 msgid "Whether leaves are the only items that can be selected."
 msgstr ""
@@ -280,20 +292,26 @@ msgctxt "OrchardCore.Taxonomies.Views.TaxonomyFieldTagsEditorSettings.Edit"
 msgid "Whether new tags can be created inline. Note: When creating tags inline only the display text term property will be set."
 msgstr ""
 
-#. <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
+#. <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
 #: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:25
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Term Content Type"
 msgstr "分类内容类型"
 
+#. <option value="">@T["Select a term content type"]</option>
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:28
+msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
+msgid "Select a term content type"
+msgstr ""
+
 #. @T["Add {0}", termContentType.DisplayName]
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:46
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:47
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "Add {0}"
 msgstr "添加 {0}"
 
 #. <div id="msg-leave" style="display:none" data>@T["You have reordered the taxonomy."]</div>
-#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:62
+#: OrchardCore.Taxonomies\Views\TaxonomyPart.Edit.cshtml:63
 msgctxt "OrchardCore.Taxonomies.Views.TaxonomyPart.Edit"
 msgid "You have reordered the taxonomy."
 msgstr "您已对分类进行了重新排序。"
diff --git a/Localization/zh-Hant/OrchardCore.Templates.Cms.Module.po b/Localization/zh-Hant/OrchardCore.Templates.Cms.Module.po
index 46dd3c81bad01..1aea864a7121f 100644
--- a/Localization/zh-Hant/OrchardCore.Templates.Cms.Module.po
+++ b/Localization/zh-Hant/OrchardCore.Templates.Cms.Module.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <label class="form-check-label" asp-for="Show">@T["Show"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPart.Edit.cshtml:6
@@ -18,7 +18,7 @@ msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPart.Edit"
 msgid "Show"
 msgstr "显示"
 
-#. <label asp-for="MySetting">@T["Setting"]</label>
+#. <label asp-for="MySetting" class="form-label">@T["Setting"]</label>
 #: OrchardCore.Templates.Cms.Module\Views\MyTestPartSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Templates.Cms.Module.Views.MyTestPartSettings.Edit"
 msgid "Setting"
diff --git a/Localization/zh-Hant/OrchardCore.Templates.po b/Localization/zh-Hant/OrchardCore.Templates.po
index fb9226d4652a4..9f5992a833bf3 100644
--- a/Localization/zh-Hant/OrchardCore.Templates.po
+++ b/Localization/zh-Hant/OrchardCore.Templates.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], design => design
 #: OrchardCore.Templates\AdminMenu.cs:25
@@ -77,13 +77,13 @@ msgid "The \"{0}\" template has been created."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Template deleted successfully."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:325
+#: OrchardCore.Templates\Controllers\TemplateController.cs:329
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Template deleted successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Templates successfully removed."]);
-#: OrchardCore.Templates\Controllers\TemplateController.cs:357
+#: OrchardCore.Templates\Controllers\TemplateController.cs:361
 msgctxt "OrchardCore.Templates.Controllers.TemplateController"
 msgid "Templates successfully removed."
 msgstr ""
@@ -172,7 +172,7 @@ msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edi
 msgid "All Templates"
 msgstr ""
 
-#. <label class="form-checkl-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
+#. <label class="form-check-label" asp-for="ExportAsFiles">@T["Export templates as files"]</label>
 #: OrchardCore.Templates\Views\Items\AllTemplatesDeploymentStep.Fields.Edit.cshtml:7
 msgctxt "OrchardCore.Templates.Views.Items.AllTemplatesDeploymentStep.Fields.Edit"
 msgid "Export templates as files"
@@ -244,7 +244,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Preview"
 msgstr "预览"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:40
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Name"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The name of the template."
 msgstr "模板的名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:47
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Description"
@@ -268,7 +268,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "The description of the template."
 msgstr "模板的说明。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Create.cshtml:53
 msgctxt "OrchardCore.Templates.Views.Template.Create"
 msgid "Content"
@@ -322,7 +322,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Preview"
 msgstr "预览"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:48
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Name"
@@ -334,7 +334,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The name of the template."
 msgstr "模板的名称。"
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:55
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Description"
@@ -346,7 +346,7 @@ msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "The description of the template."
 msgstr "模板描述。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Templates\Views\Template\Edit.cshtml:61
 msgctxt "OrchardCore.Templates.Views.Template.Edit"
 msgid "Content"
diff --git a/Localization/zh-Hant/OrchardCore.Tenants.po b/Localization/zh-Hant/OrchardCore.Tenants.po
index a1ae9dd412472..754ef161f67b9 100644
--- a/Localization/zh-Hant/OrchardCore.Tenants.po
+++ b/Localization/zh-Hant/OrchardCore.Tenants.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
 #: OrchardCore.Tenants\AdminMenu.cs:34
@@ -27,183 +27,183 @@ msgid "Tenants"
 msgstr "租户"
 
 #. S["All"],
-#: OrchardCore.Tenants\Controllers\AdminController.cs:182
+#: OrchardCore.Tenants\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All"
 msgstr ""
 
 #. new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:187
+#: OrchardCore.Tenants\Controllers\AdminController.cs:188
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "All states"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:188
+#: OrchardCore.Tenants\Controllers\AdminController.cs:189
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Running"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:189
+#: OrchardCore.Tenants\Controllers\AdminController.cs:190
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disabled"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:190
+#: OrchardCore.Tenants\Controllers\AdminController.cs:191
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Uninitialized"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:194
+#: OrchardCore.Tenants\Controllers\AdminController.cs:195
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-#: OrchardCore.Tenants\Controllers\AdminController.cs:195
+#: OrchardCore.Tenants\Controllers\AdminController.cs:196
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "State"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:199
+#: OrchardCore.Tenants\Controllers\AdminController.cs:200
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-#: OrchardCore.Tenants\Controllers\AdminController.cs:200
+#: OrchardCore.Tenants\Controllers\AdminController.cs:201
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
 #. await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:252
-#: OrchardCore.Tenants\Controllers\AdminController.cs:523
+#: OrchardCore.Tenants\Controllers\AdminController.cs:253
+#: OrchardCore.Tenants\Controllers\AdminController.cs:528
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You cannot disable the default tenant."
 msgstr "您不能禁用默认租户。"
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:256
+#: OrchardCore.Tenants\Controllers\AdminController.cs:257
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already disabled."
 msgstr "租户 \"{0}\" 已被禁用。"
 
 #. await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:268
+#: OrchardCore.Tenants\Controllers\AdminController.cs:269
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' is already enabled."
 msgstr "租户 '{0}' 已经启用。"
 
 #. await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:529
+#: OrchardCore.Tenants\Controllers\AdminController.cs:534
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:558
+#: OrchardCore.Tenants\Controllers\AdminController.cs:563
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only enable a Disabled tenant."
 msgstr "您只能启用一个禁用租户。"
 
 #. await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:616
+#: OrchardCore.Tenants\Controllers\AdminController.cs:621
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "You can only remove a 'Disabled' or 'Uninitialized' tenant."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:623
+#: OrchardCore.Tenants\Controllers\AdminController.cs:628
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "An error occurred while removing the tenant '{0}'. {1}"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-#: OrchardCore.Tenants\Controllers\AdminController.cs:632
+#: OrchardCore.Tenants\Controllers\AdminController.cs:637
 msgctxt "OrchardCore.Tenants.Controllers.AdminController"
 msgid "The tenant '{0}' was removed, see the log file for more info."
 msgstr ""
 
 #. return BadRequest(S["You can only disable a Running tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:216
+#: OrchardCore.Tenants\Controllers\ApiController.cs:218
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only disable a Running tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only enable a Disabled tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:245
+#: OrchardCore.Tenants\Controllers\ApiController.cs:247
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only enable a Disabled tenant."
 msgstr ""
 
 #. return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:274
+#: OrchardCore.Tenants\Controllers\ApiController.cs:276
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "You can only remove a 'Disabled' or an 'Uninitialized' tenant."
 msgstr ""
 
 #. title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-#: OrchardCore.Tenants\Controllers\ApiController.cs:281
+#: OrchardCore.Tenants\Controllers\ApiController.cs:283
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "An error occurred while removing the tenant '{0}'."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:310
+#: OrchardCore.Tenants\Controllers\ApiController.cs:312
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "User name '{0}' is invalid, can only contain letters or digits."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:316
+#: OrchardCore.Tenants\Controllers\ApiController.cs:318
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The email is invalid."
 msgstr ""
 
 #. ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:326
+#: OrchardCore.Tenants\Controllers\ApiController.cs:328
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Tenant not found: '{0}'"
 msgstr "未找到租户: \"{0}\""
 
 #. return BadRequest(S["The tenant can't be setup."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:336
+#: OrchardCore.Tenants\Controllers\ApiController.cs:338
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The tenant can't be setup."
 msgstr "无法设置租户。"
 
 #. return BadRequest(S["The database provider is not defined."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:348
+#: OrchardCore.Tenants\Controllers\ApiController.cs:350
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not defined."
 msgstr "未定义数据库提供程序。"
 
 #. return BadRequest(S["The database provider is not supported."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:354
+#: OrchardCore.Tenants\Controllers\ApiController.cs:356
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The database provider is not supported."
 msgstr ""
 
 #. return BadRequest(S["The connection string is required for this database provider."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:380
+#: OrchardCore.Tenants\Controllers\ApiController.cs:382
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "The connection string is required for this database provider."
 msgstr "此数据库提供程序需要连接字符串。"
 
-#. return BadRequest(S["Either 'Recipe' or 'RecipeName' is required."]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:396
+#. return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+#: OrchardCore.Tenants\Controllers\ApiController.cs:398
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
-msgid "Either 'Recipe' or 'RecipeName' is required."
-msgstr "\"食谱\" 或 \"食谱名称\" 是必需的。"
+msgid "Either a 'recipe' file or 'RecipeName' is required."
+msgstr ""
 
 #. return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-#: OrchardCore.Tenants\Controllers\ApiController.cs:422
+#: OrchardCore.Tenants\Controllers\ApiController.cs:424
 msgctxt "OrchardCore.Tenants.Controllers.ApiController"
 msgid "Recipe '{0}' not found."
 msgstr "找不到配方 '{0}'."
@@ -253,79 +253,73 @@ msgid "Feature Profiles"
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:43
+#: OrchardCore.Tenants\Services\TenantValidator.cs:42
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is mandatory."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:54
+#: OrchardCore.Tenants\Services\TenantValidator.cs:53
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The feature profile does not exist."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:61
+#: OrchardCore.Tenants\Services\TenantValidator.cs:60
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "Invalid tenant name. Must contain characters only and no spaces."
 msgstr ""
 
-#. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["Host and url prefix can not be empty at the same time."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:70
-msgctxt "OrchardCore.Tenants.Services.TenantValidator"
-msgid "Host and url prefix can not be empty at the same time."
-msgstr ""
-
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:75
+#: OrchardCore.Tenants\Services\TenantValidator.cs:67
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The url prefix can not contain more than one segment."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:83
+#: OrchardCore.Tenants\Services\TenantValidator.cs:75
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same host and prefix already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:97
+#: OrchardCore.Tenants\Services\TenantValidator.cs:93
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The tenant name is in conflict with the 'Default' tenant."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:101
+#: OrchardCore.Tenants\Services\TenantValidator.cs:97
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "A tenant with the same name already exists."
 msgstr ""
 
 #. errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:106
+#: OrchardCore.Tenants\Services\TenantValidator.cs:102
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The existing tenant to be validated was not found."
 msgstr ""
 
 #. S["The provided database provider is not supported."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:130
+#: OrchardCore.Tenants\Services\TenantValidator.cs:129
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database provider is not supported."
 msgstr ""
 
 #. S["The provided connection string is invalid or server is unreachable."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:136
+#: OrchardCore.Tenants\Services\TenantValidator.cs:135
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided connection string is invalid or server is unreachable."
 msgstr ""
 
 #. S["The related database file is already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:144
+#: OrchardCore.Tenants\Services\TenantValidator.cs:143
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The related database file is already in use."
 msgstr ""
 
 #. S["The provided database, table prefix and schema are already in use."]));
-#: OrchardCore.Tenants\Services\TenantValidator.cs:150
+#: OrchardCore.Tenants\Services\TenantValidator.cs:149
 msgctxt "OrchardCore.Tenants.Services.TenantValidator"
 msgid "The provided database, table prefix and schema are already in use."
 msgstr ""
@@ -450,7 +444,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Optionally specify which presets should be used for the Setup experience."
 msgstr ""
 
-#. <label asp-for="DatabaseProvider">@T["What type of database to use?"]</label>
+#. <label asp-for="DatabaseProvider" class="form-label">@T["What type of database to use?"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:12
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "What type of database to use?"
@@ -468,19 +462,19 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "The connection string to your database instance, e.g. {0}."
 msgstr ""
 
-#. <label asp-for="TablePrefix">@T["Table Prefix"]</label>
+#. <label asp-for="TablePrefix" class="form-label">@T["Table Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionString">@T["Connection string"]</label>
+#. <label asp-for="ConnectionString" class="form-label">@T["Connection string"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="Schema">@T["Table Schema"]</label>
+#. <label asp-for="Schema" class="form-label">@T["Table Schema"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantDatabaseInfo.cshtml:43
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantDatabaseInfo"
 msgid "Table Schema"
@@ -510,7 +504,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantFeatureProfile"
 msgid "Optionally specify which feature profile should be applied to this tenant."
 msgstr ""
 
-#. <label asp-for="Category">@T["Category"]</label>
+#. <label asp-for="Category" class="form-label">@T["Category"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Category"
@@ -522,7 +516,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The category of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefix">@T["Url Prefix"]</label>
+#. <label asp-for="RequestUrlPrefix" class="form-label">@T["Url Prefix"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Url Prefix"
@@ -534,7 +528,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"https://orchardcore.net/site1\"."
 msgstr ""
 
-#. <label asp-for="Description">@T["Description"]</label>
+#. <label asp-for="Description" class="form-label">@T["Description"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Description"
@@ -546,7 +540,7 @@ msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "The description of the tenant."
 msgstr ""
 
-#. <label asp-for="RequestUrlHost">@T["Hostname"]</label>
+#. <label asp-for="RequestUrlHost" class="form-label">@T["Hostname"]</label>
 #: OrchardCore.Tenants\Views\Shared\_TenantInfo.cshtml:24
 msgctxt "OrchardCore.Tenants.Views.Shared._TenantInfo"
 msgid "Hostname"
@@ -612,7 +606,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Create Tenant"
 msgstr "创建租户"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Create.cshtml:10
 msgctxt "OrchardCore.Tenants.Views.Admin.Create"
 msgid "Name"
@@ -648,7 +642,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Design"
 msgid "Create Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Name"
@@ -660,7 +654,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Select the name of the tenant to create."
 msgstr ""
 
-#. <label asp-for="DescriptionExpression">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
+#. <label asp-for="DescriptionExpression" class="form-label">@T["Description"] <span asp-validation-for="DescriptionExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Description"
@@ -672,7 +666,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) the description of the tenant to create."
 msgstr ""
 
-#. <label asp-for="RequestUrlPrefixExpression">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
+#. <label asp-for="RequestUrlPrefixExpression" class="form-label">@T["Url Prefix"] <span asp-validation-for="RequestUrlPrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Url Prefix"
@@ -684,7 +678,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "(Optional) Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"."
 msgstr ""
 
-#. <label asp-for="RequestUrlHostExpression">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
+#. <label asp-for="RequestUrlHostExpression" class="form-label">@T["Host name"] <span asp-validation-for="RequestUrlHostExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:23
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Host name"
@@ -696,25 +690,25 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\". With Liquid support."
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:29
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="TablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:34
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="ConnectionStringExpression">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
+#. <label asp-for="ConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="ConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="TablePrefixExpression">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
+#. <label asp-for="TablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="SchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:44
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Schema"
@@ -732,13 +726,13 @@ msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:50
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Recipe"
 msgstr ""
 
-#. <label asp-for="FeatureProfileExpression">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
+#. <label asp-for="FeatureProfileExpression" class="form-label">@T["Feature Profile"] <span asp-validation-for="FeatureProfileExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\CreateTenantTask.Fields.Edit.cshtml:55
 msgctxt "OrchardCore.Tenants.Views.Items.CreateTenantTask.Fields.Edit"
 msgid "Feature Profile"
@@ -762,7 +756,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Design"
 msgid "Disable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\DisableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.DisableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -792,7 +786,7 @@ msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Edit Tenant"
 msgstr "编辑租户"
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\Admin\Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Admin.Edit"
 msgid "Name"
@@ -828,7 +822,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Design"
 msgid "Enable Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\EnableTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -852,7 +846,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.EnableTenantTask.Fields.Thumbnail"
 msgid "Enable a tenant."
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:13
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Name"
@@ -864,7 +858,7 @@ msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfil
 msgid "The name of the feature profile."
 msgstr ""
 
-#. <label asp-for="FeatureRules">@T["Rules"]</label>
+#. <label asp-for="FeatureRules" class="form-label">@T["Rules"]</label>
 #: OrchardCore.Tenants\Views\FeatureProfiles\EditorTemplates\FeatureProfileViewModel.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.FeatureProfiles.EditorTemplates.FeatureProfileViewModel"
 msgid "Rules"
@@ -1222,8 +1216,8 @@ msgctxt "OrchardCore.Tenants.Views.ManageTenantActionTags"
 msgid "Invalid"
 msgstr ""
 
-#. <span class="icon"><i class="fa-solid fa-gear" aria-hidden="true"></i></span><span class="title">@T["Design"]</span>
-#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:1
+#. <span class="title">@T["Design"]</span>
+#: OrchardCore.Tenants\Views\NavigationItemText-design.Id.cshtml:4
 msgctxt "OrchardCore.Tenants.Views.NavigationItemText-design.Id"
 msgid "Design"
 msgstr "設計"
@@ -1240,7 +1234,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Design"
 msgid "Setup Tenant"
 msgstr ""
 
-#. <label asp-for="TenantNameExpression">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
+#. <label asp-for="TenantNameExpression" class="form-label">@T["Tenant name"] <span asp-validation-for="TenantNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Tenant name"
@@ -1252,49 +1246,49 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Select the name of tenant to setup."
 msgstr ""
 
-#. <label asp-for="SiteNameExpression">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
+#. <label asp-for="SiteNameExpression" class="form-label">@T["Site name"] <span asp-validation-for="SiteNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:11
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Site name"
 msgstr ""
 
-#. <label asp-for="AdminUsernameExpression">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
+#. <label asp-for="AdminUsernameExpression" class="form-label">@T["Admin user name"] <span asp-validation-for="AdminUsernameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:16
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin user name"
 msgstr ""
 
-#. <label asp-for="AdminEmailExpression">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
+#. <label asp-for="AdminEmailExpression" class="form-label">@T["Admin email"] <span asp-validation-for="AdminEmailExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:21
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin email"
 msgstr ""
 
-#. <label asp-for="AdminPasswordExpression">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
+#. <label asp-for="AdminPasswordExpression" class="form-label">@T["Admin password"] <span asp-validation-for="AdminPasswordExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Admin password"
 msgstr ""
 
-#. <label asp-for="DatabaseProviderExpression">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
+#. <label asp-for="DatabaseProviderExpression" class="form-label">@T["What type of database to use?"] <span asp-validation-for="DatabaseProviderExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "What type of database to use?"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Table Prefix"] <span asp-validation-for="DatabaseTablePrefixExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:35
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Table Prefix"
 msgstr ""
 
-#. <label asp-for="DatabaseConnectionStringExpression">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
+#. <label asp-for="DatabaseConnectionStringExpression" class="form-label">@T["Connection string"] <span asp-validation-for="DatabaseConnectionStringExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:40
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Connection string"
 msgstr ""
 
-#. <label asp-for="DatabaseTablePrefixExpression">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
+#. <label asp-for="DatabaseTablePrefixExpression" class="form-label">@T["Schema"] <span asp-validation-for="DatabaseSchemaExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Schema"
@@ -1312,7 +1306,7 @@ msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "For example, '{0}' for SQL Server."
 msgstr ""
 
-#. <label asp-for="RecipeNameExpression">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
+#. <label asp-for="RecipeNameExpression" class="form-label">@T["Recipe"] <span asp-validation-for="RecipeNameExpression"></span></label>
 #: OrchardCore.Tenants\Views\Items\SetupTenantTask.Fields.Edit.cshtml:51
 msgctxt "OrchardCore.Tenants.Views.Items.SetupTenantTask.Fields.Edit"
 msgid "Recipe"
diff --git a/Localization/zh-Hant/OrchardCore.Tests.po b/Localization/zh-Hant/OrchardCore.Tests.po
index 3bb8e0148dd79..1a3231a502d58 100644
--- a/Localization/zh-Hant/OrchardCore.Tests.po
+++ b/Localization/zh-Hant/OrchardCore.Tests.po
@@ -10,40 +10,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-18 17:49\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Add Task"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:19
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Add Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:39
+#: OrchardCore.Tests\Workflows\Activities\AddTask.cs:37
 msgctxt "OrchardCore.Tests.Workflows.Activities.AddTask"
 msgid "Done"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Write Line Task"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:21
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Write Line Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Test"];
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:25
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:23
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Test"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:35
+#: OrchardCore.Tests\Workflows\Activities\WriteLineTask.cs:33
 msgctxt "OrchardCore.Tests.Workflows.Activities.WriteLineTask"
 msgid "Done"
 msgstr ""
diff --git a/Localization/zh-Hant/OrchardCore.Themes.po b/Localization/zh-Hant/OrchardCore.Themes.po
index dc6c1095db2ad..b0c2e30d6f7a2 100644
--- a/Localization/zh-Hant/OrchardCore.Themes.po
+++ b/Localization/zh-Hant/OrchardCore.Themes.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:21\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
 #: OrchardCore.Themes\AdminMenu.cs:25
@@ -204,3 +204,29 @@ msgctxt "OrchardCore.Themes.Views.Items.ThemesDeploymentStep.Thumbnail"
 msgid "Exports the currently selected site theme and admin theme."
 msgstr "导出当前选定的站点主题和管理主题。"
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:3
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:5
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:13
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:21
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: OrchardCore.Themes\Views\ToggleTheme.cshtml:29
+msgctxt "OrchardCore.Themes.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/zh-Hant/OrchardCore.Title.po b/Localization/zh-Hant/OrchardCore.Title.po
index 9fb816eed0b40..50995379c849c 100644
--- a/Localization/zh-Hant/OrchardCore.Title.po
+++ b/Localization/zh-Hant/OrchardCore.Title.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
 #: OrchardCore.Title\Drivers\TitlePartDisplayDriver.cs:60
@@ -19,24 +19,24 @@ msgid "A value is required for Title."
 msgstr ""
 
 #. context.Fail(S["A value is required for Title."], nameof(part.Title));
-#: OrchardCore.Title\Handlers\TitlePartHandler.cs:50
+#: OrchardCore.Title\Handlers\TitlePartHandler.cs:49
 msgctxt "OrchardCore.Title.Handlers.TitlePartHandler"
 msgid "A value is required for Title."
 msgstr ""
 
-#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", String.Join(" ", errors)]);
+#. context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
 #: OrchardCore.Title\Settings\TitlePartSettingsDisplayDriver.cs:49
 msgctxt "OrchardCore.Title.Settings.TitlePartSettingsDisplayDriver"
 msgid "Pattern doesn't contain a valid Liquid expression. Details: {0}"
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.DisplayOption.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.DisplayOption"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
+#. <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
 #: OrchardCore.Title\Views\TitlePart.Edit.cshtml:13
 msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "Title"
@@ -54,13 +54,13 @@ msgctxt "OrchardCore.Title.Views.TitlePart.Edit"
 msgid "The title will be auto-generated using the pattern."
 msgstr ""
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Title\Views\TitlePart.Option.cshtml:4
 msgctxt "OrchardCore.Title.Views.TitlePart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Options">@T["Options"]</label>
+#. <label asp-for="Options" class="form-label">@T["Options"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Options"
@@ -102,7 +102,7 @@ msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Check to render the title in display views."
 msgstr ""
 
-#. <label asp-for="Pattern">@T["Pattern"]</label>
+#. <label asp-for="Pattern" class="form-label">@T["Pattern"]</label>
 #: OrchardCore.Title\Views\TitlePartSettings.Edit.cshtml:35
 msgctxt "OrchardCore.Title.Views.TitlePartSettings.Edit"
 msgid "Pattern"
diff --git a/Localization/zh-Hant/OrchardCore.Twitter.po b/Localization/zh-Hant/OrchardCore.Twitter.po
index 469d068ab42c6..961a6e81c775d 100644
--- a/Localization/zh-Hant/OrchardCore.Twitter.po
+++ b/Localization/zh-Hant/OrchardCore.Twitter.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:33\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], security => security
 #: OrchardCore.Twitter\AdminMenuSignin.cs:23
@@ -107,25 +107,25 @@ msgid "Access token secret is required"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Update Twitter Status Task"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:29
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Update Twitter Status Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Social"];
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:35
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:32
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Social"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:47
+#: OrchardCore.Twitter\Workflows\Activities\UpdateTwitterStatusTask.cs:44
 msgctxt "OrchardCore.Twitter.Workflows.Activities.UpdateTwitterStatusTask"
 msgid "Failed"
 msgstr ""
@@ -136,74 +136,74 @@ msgctxt "OrchardCore.Twitter.Views.NavigationItemText-twitter.Id"
 msgid "Twitter"
 msgstr ""
 
-#. <p class="alert alert-warning">@T["The current tenant will be reloaded when the settings are saved."]
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:4
+#. @T["The current tenant will be reloaded when the settings are saved."]
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The current tenant will be reloaded when the settings are saved."
 msgstr ""
 
-#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a></p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:5
+#. <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "See documentation"
 msgstr ""
 
 #. <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:9
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:11
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "An error occurred while decrypting a setting. Please apply and save."
 msgstr ""
 
 #. <h3>@T["Twitter Integration Settings"]</h3>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:12
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:14
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Twitter Integration Settings"
 msgstr ""
 
-#. <label asp-for="APIKey">@T["API key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:16
+#. <label asp-for="APIKey" class="form-label">@T["API key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:18
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API key"
 msgstr ""
 
 #. <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:19
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:21
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API key defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="APISecretKey">@T["API secret key"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:25
+#. <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:27
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "API secret key"
 msgstr ""
 
 #. <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:28
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:30
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The API secret defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessToken">@T["Access Token"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:34
+#. <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:36
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:37
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:39
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token defined in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
 
-#. <label asp-for="AccessTokenSecret">@T["Access Token Secret"]</label>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:43
+#. <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:45
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "Access Token Secret"
 msgstr ""
 
 #. <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
-#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:46
+#: OrchardCore.Twitter\Views\TwitterSettings.Edit.cshtml:48
 msgctxt "OrchardCore.Twitter.Views.TwitterSettings.Edit"
 msgid "The Access Token Secret in the Keys and tokens tab of twitter app dashboard."
 msgstr ""
@@ -226,7 +226,7 @@ msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "Sign in with Twitter Settings"
 msgstr "使用 Twitter 登入"
 
-#. <label asp-for="CallbackPath">@T["CallbackPath"]</label>
+#. <label asp-for="CallbackPath" class="form-label">@T["CallbackPath"]</label>
 #: OrchardCore.Twitter\Views\TwitterSigninSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Twitter.Views.TwitterSigninSettings.Edit"
 msgid "CallbackPath"
@@ -256,7 +256,7 @@ msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Design"
 msgid "Update Twitter Status"
 msgstr ""
 
-#. <label asp-for="StatusTemplate">@T["Template for updating twitter status"]</label>
+#. <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
 #: OrchardCore.Twitter\Views\Items\UpdateTwitterStatusTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Twitter.Views.Items.UpdateTwitterStatusTask.Fields.Edit"
 msgid "Template for updating twitter status"
diff --git a/Localization/zh-Hant/OrchardCore.Users.Core.po b/Localization/zh-Hant/OrchardCore.Users.Core.po
index 63137806133d0..3475f52b8581d 100644
--- a/Localization/zh-Hant/OrchardCore.Users.Core.po
+++ b/Localization/zh-Hant/OrchardCore.Users.Core.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:23\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. reportError(string.Empty, S["Local login is disabled."]);
 #: OrchardCore.Users.Core\Services\UserService.cs:54
@@ -138,8 +138,14 @@ msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Email '{0}' is invalid."
 msgstr "电子邮件'{0}'无效。"
 
+#. reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+#: OrchardCore.Users.Core\Services\UserService.cs:296
+msgctxt "OrchardCore.Users.Services.UserService"
+msgid "The reset token is invalid. Please request a new token."
+msgstr ""
+
 #. reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-#: OrchardCore.Users.Core\Services\UserService.cs:297
+#: OrchardCore.Users.Core\Services\UserService.cs:299
 msgctxt "OrchardCore.Users.Services.UserService"
 msgid "Unexpected error: '{0}'."
 msgstr "异常错误：`{0}`"
diff --git a/Localization/zh-Hant/OrchardCore.Users.po b/Localization/zh-Hant/OrchardCore.Users.po
index 42e9ebad1e3fe..43fecdce380e2 100644
--- a/Localization/zh-Hant/OrchardCore.Users.po
+++ b/Localization/zh-Hant/OrchardCore.Users.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. builder.Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
 #: OrchardCore.Users\AdminMenu.cs:27
@@ -256,198 +256,198 @@ msgctxt "OrchardCore.Users.Commands.UserCommands"
 msgid "User created successfully"
 msgstr "已成功创建用户"
 
-#. ModelState.AddModelError(String.Empty, S["Local login is disabled."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:167
+#. ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:166
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Local login is disabled."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
-#: OrchardCore.Users\Controllers\AccountController.cs:207
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+#: OrchardCore.Users\Controllers\AccountController.cs:206
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#. ModelState.AddModelError(String.Empty, S["Invalid login attempt."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:217
-#: OrchardCore.Users\Controllers\AccountController.cs:367
-#: OrchardCore.Users\Controllers\AccountController.cs:481
-#: OrchardCore.Users\Controllers\AccountController.cs:641
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:216
+#: OrchardCore.Users\Controllers\AccountController.cs:366
+#: OrchardCore.Users\Controllers\AccountController.cs:480
+#: OrchardCore.Users\Controllers\AccountController.cs:640
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Invalid login attempt."
 msgstr "登录尝试失败"
 
 #. await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:258
+#: OrchardCore.Users\Controllers\AccountController.cs:257
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#. ModelState.AddModelError(String.Empty, S["An error occurred in external provider."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:335
-#: OrchardCore.Users\Controllers\AccountController.cs:344
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#. ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:334
+#: OrchardCore.Users\Controllers\AccountController.cs:343
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "An error occurred in external provider."
 msgstr ""
 
 #. var message = S["Site does not allow user registration."];
-#: OrchardCore.Users\Controllers\AccountController.cs:406
+#: OrchardCore.Users\Controllers\AccountController.cs:405
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Site does not allow user registration."
 msgstr "网站不允许用户注册。"
 
 #. }, S["Confirm your account"], _logger);
 #. }, S["Confirm your account"], _logger);
-#: OrchardCore.Users\Controllers\AccountController.cs:437
-#: OrchardCore.Users\Controllers\AccountController.cs:554
+#: OrchardCore.Users\Controllers\AccountController.cs:436
+#: OrchardCore.Users\Controllers\AccountController.cs:553
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "Confirm your account"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The specified user is not allowed to sign in."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:842
+#. ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:841
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "The specified user is not allowed to sign in."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["You must confirm your email."]);
-#: OrchardCore.Users\Controllers\AccountController.cs:858
+#. ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+#: OrchardCore.Users\Controllers\AccountController.cs:857
 msgctxt "OrchardCore.Users.Controllers.AccountController"
 msgid "You must confirm your email."
 msgstr ""
 
 #. new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-#: OrchardCore.Users\Controllers\AdminController.cs:144
+#: OrchardCore.Users\Controllers\AdminController.cs:142
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "All Users"
 msgstr "所有使用者"
 
 #. new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-#: OrchardCore.Users\Controllers\AdminController.cs:145
+#: OrchardCore.Users\Controllers\AdminController.cs:143
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-#: OrchardCore.Users\Controllers\AdminController.cs:146
+#: OrchardCore.Users\Controllers\AdminController.cs:144
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disabled Users"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-#: OrchardCore.Users\Controllers\AdminController.cs:154
+#: OrchardCore.Users\Controllers\AdminController.cs:152
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Name"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-#: OrchardCore.Users\Controllers\AdminController.cs:155
+#: OrchardCore.Users\Controllers\AdminController.cs:153
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Email"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-#: OrchardCore.Users\Controllers\AdminController.cs:162
+#: OrchardCore.Users\Controllers\AdminController.cs:160
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Approve"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:163
+#: OrchardCore.Users\Controllers\AdminController.cs:161
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Enable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-#: OrchardCore.Users\Controllers\AdminController.cs:164
+#: OrchardCore.Users\Controllers\AdminController.cs:162
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Disable"
 msgstr ""
 
 #. new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-#: OrchardCore.Users\Controllers\AdminController.cs:165
+#: OrchardCore.Users\Controllers\AdminController.cs:163
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Delete"
 msgstr ""
 
-#. new SelectListItem() { Text = S["All roles"], Value = String.Empty, Selected = (options.SelectedRole == String.Empty) },
-#: OrchardCore.Users\Controllers\AdminController.cs:173
+#. new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+#: OrchardCore.Users\Controllers\AdminController.cs:182
 msgctxt "OrchardCore.Users.Controllers.AdminController"
-msgid "All roles"
+msgid "Any role"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = String.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
-#: OrchardCore.Users\Controllers\AdminController.cs:174
+#. new SelectListItem() { Text = S["Authenticated (no roles)"], Value = "Authenticated", Selected = string.Equals(options.SelectedRole, "Authenticated", StringComparison.OrdinalIgnoreCase) }
+#: OrchardCore.Users\Controllers\AdminController.cs:183
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Authenticated (no roles)"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:248
+#: OrchardCore.Users\Controllers\AdminController.cs:265
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully approved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:255
+#: OrchardCore.Users\Controllers\AdminController.cs:272
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully deleted."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:263
+#: OrchardCore.Users\Controllers\AdminController.cs:280
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully disabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-#: OrchardCore.Users\Controllers\AdminController.cs:271
+#: OrchardCore.Users\Controllers\AdminController.cs:288
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User {0} successfully enabled."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User created successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:321
+#: OrchardCore.Users\Controllers\AdminController.cs:338
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User created successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User updated successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:407
+#: OrchardCore.Users\Controllers\AdminController.cs:424
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User updated successfully."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["User deleted successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:461
+#: OrchardCore.Users\Controllers\AdminController.cs:478
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User deleted successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not delete the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:467
+#: OrchardCore.Users\Controllers\AdminController.cs:484
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not delete the user."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Password updated correctly."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:514
+#: OrchardCore.Users\Controllers\AdminController.cs:531
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Password updated correctly."
 msgstr "密码更新正确。"
 
 #. await _notifier.SuccessAsync(H["User unlocked successfully."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:541
+#: OrchardCore.Users\Controllers\AdminController.cs:558
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "User unlocked successfully."
 msgstr ""
 
 #. await _notifier.ErrorAsync(H["Could not unlock the user."]);
-#: OrchardCore.Users\Controllers\AdminController.cs:547
+#: OrchardCore.Users\Controllers\AdminController.cs:564
 msgctxt "OrchardCore.Users.Controllers.AdminController"
 msgid "Could not unlock the user."
 msgstr ""
@@ -632,25 +632,25 @@ msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Unable to find an active two-factor provider."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out."]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:144
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid verification code."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid verification code."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:150
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid verification code."
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["The account is locked out"]);
+#. ModelState.AddModelError(string.Empty, S["The account is locked out"]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:205
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "The account is locked out"
 msgstr ""
 
-#. ModelState.AddModelError(String.Empty, S["Invalid recovery code entered."]);
+#. ModelState.AddModelError(string.Empty, S["Invalid recovery code entered."]);
 #: OrchardCore.Users\Controllers\TwoFactorAuthenticationController.cs:212
 msgctxt "OrchardCore.Users.Controllers.TwoFactorAuthenticationController"
 msgid "Invalid recovery code entered."
@@ -758,56 +758,50 @@ msgctxt "OrchardCore.Users.Drivers.UserInformationDisplayDriver"
 msgid "Please provide a valid phone number."
 msgstr ""
 
-#. await _notifier.WarningAsync(H["Cannot update your own roles."]);
-#: OrchardCore.Users\Drivers\UserRoleDisplayDriver.cs:105
-msgctxt "OrchardCore.Users.Drivers.UserRoleDisplayDriver"
-msgid "Cannot update your own roles."
-msgstr ""
-
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Login settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-#: OrchardCore.Users\Startup.cs:325
+#: OrchardCore.Users\Startup.cs:336
 msgctxt "OrchardCore.Users.LoginDeploymentStartup"
 msgid "Exports the Login settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Change Email settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-#: OrchardCore.Users\Startup.cs:372
+#: OrchardCore.Users\Startup.cs:383
 msgctxt "OrchardCore.Users.ChangeEmailDeploymentStartup"
 msgid "Exports the Change Email settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Registration settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-#: OrchardCore.Users\Startup.cs:426
+#: OrchardCore.Users\Startup.cs:437
 msgctxt "OrchardCore.Users.RegistrationDeploymentStartup"
 msgid "Exports the Registration settings."
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Reset Password settings"
 msgstr ""
 
 #. services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-#: OrchardCore.Users\Startup.cs:486
+#: OrchardCore.Users\Startup.cs:497
 msgctxt "OrchardCore.Users.ResetPasswordDeploymentStartup"
 msgid "Exports the Reset Password settings."
 msgstr ""
@@ -981,61 +975,61 @@ msgid "The new password and confirmation password do not match."
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Assign User Role Task"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:31
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Assign User Role Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:33
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:35
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Failed"]);
-#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:49
+#: OrchardCore.Users\Workflows\Activities\AssignUserRoleTask.cs:51
 msgctxt "OrchardCore.Users.Workflows.Activities.AssignUserRoleTask"
 msgid "Failed"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Register User Task"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:52
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Register User Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:58
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:55
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "User"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Done"
 msgstr "完成"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Valid"
 msgstr "有效"
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:88
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:85
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "Invalid"
 msgstr "无效"
 
 #. updater?.ModelState.TryAddModelError("", S["No email service is available"]);
-#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:152
+#: OrchardCore.Users\Workflows\Activities\RegisterUserTask.cs:149
 msgctxt "OrchardCore.Users.Workflows.Activities.RegisterUserTask"
 msgid "No email service is available"
 msgstr "没有可用的电子邮件服务"
@@ -1089,43 +1083,73 @@ msgid "User Updated Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["User"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:28
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:26
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "User"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Validate User Task"];
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:42
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:40
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Validate User Task"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Anonymous"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "Authenticated"
 msgstr ""
 
 #. return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:46
+#: OrchardCore.Users\Workflows\Activities\ValidateUserTask.cs:44
 msgctxt "OrchardCore.Users.Workflows.Activities.ValidateUserTask"
 msgid "InRole"
 msgstr ""
 
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
 #. updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:45
-#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:50
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:44
+#: OrchardCore.Users\Workflows\Drivers\RegisterUserTaskDisplayDriver.cs:49
 msgctxt "OrchardCore.Users.Workflows.Drivers.RegisterUserTaskDisplayDriver"
 msgid "A value is required for {0}."
 msgstr ""
 
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Edit.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Edit"
+msgid "All Users"
+msgstr ""
+
+#. <h5>@T["All Users"]</h5>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "All Users"
+msgstr ""
+
+#. <span class="hint">@T["Adds all users to the plan."]</span>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Summary.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Summary"
+msgid "Adds all users to the plan."
+msgstr ""
+
+#. <h4 class="card-title">@T["All Users"]</h4>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "All Users"
+msgstr ""
+
+#. <p>@T["Exports every user."]</p>
+#: OrchardCore.Users\Views\Items\AllUsersDeploymentStep.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.AllUsersDeploymentStep.Thumbnail"
+msgid "Exports every user."
+msgstr ""
+
 #. <h4><i class="fa-solid fa-user" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Assign user to role"])</h4>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Design.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
@@ -1138,7 +1162,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Design"
 msgid "{0} to role {1}"
 msgstr ""
 
-#. <label asp-for="UserName">@T["UserName"]</label>
+#. <label asp-for="UserName" class="form-label">@T["UserName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "UserName"
@@ -1150,7 +1174,7 @@ msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "The User to assign. With Liquid support."
 msgstr ""
 
-#. <label asp-for="RoleName">@T["RoleName"]</label>
+#. <label asp-for="RoleName" class="form-label">@T["RoleName"]</label>
 #: OrchardCore.Users\Views\Items\AssignUserRoleTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Users.Views.Items.AssignUserRoleTask.Fields.Edit"
 msgid "RoleName"
@@ -1236,19 +1260,19 @@ msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Change password"
 msgstr "更改密码"
 
-#. <label asp-for="CurrentPassword" class="col-md-4 control-label">@T["Current password"]</label>
+#. <label asp-for="CurrentPassword" class="col-md-4 form-label">@T["Current password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "Current password"
 msgstr "当前密码："
 
-#. <label asp-for="Password" class="col-md-4 control-label">@T["New password"]</label>
+#. <label asp-for="Password" class="col-md-4 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password"
 msgstr "新密码"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-4 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-4 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Account\ChangePassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.Account.ChangePassword"
 msgid "New password confirmation"
@@ -1314,6 +1338,54 @@ msgctxt "OrchardCore.Users.Views.Admin.Create"
 msgid "Create User"
 msgstr "创建用户"
 
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:3
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Custom User Settings"
+msgstr ""
+
+#. @T["Include all custom user settings."]
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "Include all custom user settings."
+msgstr ""
+
+#. <span class="hint">@T["The custom user settings to add as part of the plan."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Edit"
+msgid "The custom user settings to add as part of the plan."
+msgstr ""
+
+#. <h5>@T["Custom User Settings"]</h5>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:8
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <span class="badge bg-success">@T["All"]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:12
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "All"
+msgstr ""
+
+#. <span class="badge bg-warning">@T["No custom user settings selected."]</span>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Summary.cshtml:23
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Summary"
+msgid "No custom user settings selected."
+msgstr ""
+
+#. <h4 class="card-title">@T["Custom User Settings"]</h4>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Custom User Settings"
+msgstr ""
+
+#. <p>@T["Exports all or specified custom user settings."]</p>
+#: OrchardCore.Users\Views\Items\CustomUserSettingsDeploymentStep.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Users.Views.Items.CustomUserSettingsDeploymentStep.Fields.Thumbnail"
+msgid "Exports all or specified custom user settings."
+msgstr ""
+
 #. <li class="breadcrumb-item"><a asp-action="Index" asp-controller="TwoFactorAuthentication">@T["Two-Factor Authentication"]</a></li>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\DisableTwoFactorAuthentication.cshtml:3
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.DisableTwoFactorAuthentication"
@@ -1350,13 +1422,13 @@ msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "Edit Password"
 msgstr "编辑密码"
 
-#. <label asp-for="NewPassword" class="w-md-50 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="w-lg-75 w-xl-50 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:9
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password"
 msgstr "新密码"
 
-#. <label asp-for="PasswordConfirmation" class="w-md-50 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="w-lg-75 w-xl-50 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\Admin\EditPassword.cshtml:17
 msgctxt "OrchardCore.Users.Views.Admin.EditPassword"
 msgid "New password confirmation"
@@ -1380,7 +1452,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Authenticator Settings"
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Subject">@T["Email Subject"]</label>
+#. <label class="form-label" asp-for="Subject">@T["Email Subject"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:9
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Subject"
@@ -1392,7 +1464,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "The subject to the email for sending the verification code. Liquid syntax is supported."
 msgstr ""
 
-#. <label class="form-check-label" asp-for="Body">@T["Email Body"]</label>
+#. <label class="form-label" asp-for="Body">@T["Email Body"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticatorLoginSettings.Edit.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticatorLoginSettings.Edit"
 msgid "Email Body"
@@ -1422,7 +1494,7 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Please check your email to reset your password."
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-4 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-4 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ForgotPassword.cshtml:15
 msgctxt "OrchardCore.Users.Views.ResetPassword.ForgotPassword"
 msgid "Email"
@@ -1526,7 +1598,7 @@ msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\AuthenticatorApp\Index.cshtml:39
 msgctxt "OrchardCore.Users.Views.AuthenticatorApp.Index"
 msgid "Verification code"
@@ -1544,7 +1616,7 @@ msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Change Email"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ChangeEmail\Index.cshtml:11
 msgctxt "OrchardCore.Users.Views.ChangeEmail.Index"
 msgid "Email"
@@ -1598,7 +1670,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "To utilize SMS as a two-factor authentication method, please click the 'Request Code' button below in order to confirm your Phone number."
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\Index.cshtml:17
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.Index"
 msgid "Phone Number"
@@ -1708,7 +1780,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Forget this device"
 msgstr ""
 
-#. <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
+#. <label asp-for="PreferredProvider" class="form-label">@T["Preferred Two-Factor Method"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\Index.cshtml:111
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.Index"
 msgid "Preferred Two-Factor Method"
@@ -1782,19 +1854,19 @@ msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. You already have an account with this email address. Enter your local account password and click the Register button to link the accounts and finish logging in."
 msgstr ""
 
-#. <label for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:16
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:23
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\LinkExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.LinkExternalLogin"
 msgid "Password"
@@ -1814,7 +1886,7 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in"
 msgstr "登录"
 
-#. <label asp-for="UserName">@T["Username or email address"]</label>
+#. <label asp-for="UserName" class="form-label">@T["Username or email address"]</label>
 #: OrchardCore.Users\Views\Account\Login.cshtml:37
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Username or email address"
@@ -1850,8 +1922,8 @@ msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Use another service to log in"
 msgstr ""
 
-#. <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
-#: OrchardCore.Users\Views\Account\Login.cshtml:82
+#. <button type="submit" class="btn btn-primary mb-1 @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+#: OrchardCore.Users\Views\Account\Login.cshtml:80
 msgctxt "OrchardCore.Users.Views.Account.Login"
 msgid "Log in using your {0} account"
 msgstr ""
@@ -1976,7 +2048,7 @@ msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthe
 msgid "Your login is protected with a second authentication method."
 msgstr ""
 
-#. <label asp-for="VerificationCode">@T["Verification code"]</label>
+#. <label asp-for="VerificationCode" class="form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\TwoFactorAuthentication\LoginWithTwoFactorAuthentication.cshtml:43
 msgctxt "OrchardCore.Users.Views.TwoFactorAuthentication.LoginWithTwoFactorAuthentication"
 msgid "Verification code"
@@ -2038,25 +2110,25 @@ msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Create a new account."
 msgstr "创建新帐户。"
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:13
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Username"
 msgstr "用户名"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:20
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Email"
 msgstr "电子邮件"
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:27
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Password"
 msgstr "密码"
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Registration\Register.cshtml:34
 msgctxt "OrchardCore.Users.Views.Registration.Register"
 msgid "Confirm password"
@@ -2074,25 +2146,25 @@ msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "You've successfully authenticated with <strong>{0}</strong>. Please fill the form below and click the Register button to complete the registration."
 msgstr ""
 
-#. <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
+#. <label asp-for="UserName" class="col-md-3 form-label">@T["Username"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:19
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Username"
 msgstr ""
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:30
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Email"
 msgstr ""
 
-#. <label asp-for="Password" class="col-md-3 control-label">@T["Password"]</label>
+#. <label asp-for="Password" class="col-md-3 form-label">@T["Password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:41
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Password"
 msgstr ""
 
-#. <label asp-for="ConfirmPassword" class="col-md-3 control-label">@T["Confirm password"]</label>
+#. <label asp-for="ConfirmPassword" class="col-md-3 form-label">@T["Confirm password"]</label>
 #: OrchardCore.Users\Views\Account\RegisterExternalLogin.cshtml:49
 msgctxt "OrchardCore.Users.Views.Account.RegisterExternalLogin"
 msgid "Confirm password"
@@ -2116,7 +2188,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Send confirmation email"
 msgstr "发送确认电子邮件"
 
-#. <label asp-for="ConfirmationEmailSubject">@T["Subject for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailSubject" class="form-label">@T["Subject for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Subject for confirmation email"
@@ -2128,7 +2200,7 @@ msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "The subject of the message. Supports Liquid syntax."
 msgstr ""
 
-#. <label asp-for="ConfirmationEmailTemplate">@T["Template for confirmation email"]</label>
+#. <label asp-for="ConfirmationEmailTemplate" class="form-label">@T["Template for confirmation email"]</label>
 #: OrchardCore.Users\Views\Items\RegisterUserTask.Fields.Edit.cshtml:20
 msgctxt "OrchardCore.Users.Views.Items.RegisterUserTask.Fields.Edit"
 msgid "Template for confirmation email"
@@ -2182,7 +2254,7 @@ msgctxt "OrchardCore.Users.Views.Registration.RegistrationPending"
 msgid "Home"
 msgstr ""
 
-#. <label asp-for="UsersCanRegister">@T["Configure users registration."]</label>
+#. <label asp-for="UsersCanRegister" class="form-label">@T["Configure users registration."]</label>
 #: OrchardCore.Users\Views\RegistrationSettings.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.RegistrationSettings.Edit"
 msgid "Configure users registration."
@@ -2344,7 +2416,7 @@ msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\EmailAuthenticator\RequestCode.cshtml:16
 msgctxt "OrchardCore.Users.Views.EmailAuthenticator.RequestCode"
 msgid "Verification code"
@@ -2406,19 +2478,19 @@ msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Reset password"
 msgstr "重置密码"
 
-#. <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
+#. <label asp-for="Email" class="col-md-3 form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:12
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "Email"
 msgstr "电子邮箱"
 
-#. <label asp-for="NewPassword" class="col-md-3 control-label">@T["New password"]</label>
+#. <label asp-for="NewPassword" class="col-md-3 form-label">@T["New password"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:19
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password"
 msgstr "新密码"
 
-#. <label asp-for="PasswordConfirmation" class="col-md-3 control-label">@T["New password confirmation"]</label>
+#. <label asp-for="PasswordConfirmation" class="col-md-3 form-label">@T["New password confirmation"]</label>
 #: OrchardCore.Users\Views\ResetPassword\ResetPassword.cshtml:27
 msgctxt "OrchardCore.Users.Views.ResetPassword.ResetPassword"
 msgid "New password confirmation"
@@ -2796,7 +2868,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserDisabledEvent.Fields.Thumbnail"
 msgid "User is disabled."
 msgstr ""
 
-#. <label asp-for="Email">@T["Email"]</label>
+#. <label asp-for="Email" class="form-label">@T["Email"]</label>
 #: OrchardCore.Users\Views\UserEmail.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserEmail.Edit"
 msgid "Email"
@@ -2820,7 +2892,7 @@ msgctxt "OrchardCore.Users.Views.Items.UserEnabledEvent.Fields.Thumbnail"
 msgid "User is enabled."
 msgstr ""
 
-#. <span class="badge bg-danger ms-2" title="@T["Disabled"]">
+#. <span class="badge text-bg-danger ms-2" title="@T["Disabled"]">
 #. <i class="fa-solid fa-user-alt-slash" aria-hidden="true"></i> @T["Disabled"]
 #: OrchardCore.Users\Views\UserFields.cshtml:6
 #: OrchardCore.Users\Views\UserFields.cshtml:7
@@ -2846,7 +2918,7 @@ msgctxt "OrchardCore.Users.Views.UserFields.Edit"
 msgid "Uncheck to disable this user account."
 msgstr ""
 
-#. <label asp-for="Password">@T["Password"]</label>
+#. <label asp-for="Password" class="form-label">@T["Password"]</label>
 #. <input asp-for="Password" type="password" class="form-control password-input-field" placeholder="@T["Password"]" />
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:31
 #: OrchardCore.Users\Views\UserFields.Edit.cshtml:34
@@ -3000,13 +3072,13 @@ msgctxt "OrchardCore.Users.Views.UserMenuItems-TwoFactor"
 msgid "Security"
 msgstr ""
 
-#. <label asp-for="UserName">@T["User name"]</label>
+#. <label asp-for="UserName" class="form-label">@T["User name"]</label>
 #: OrchardCore.Users\Views\UserName.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserName.Edit"
 msgid "User name"
 msgstr ""
 
-#. <label asp-for="PhoneNumber">@T["Phone Number"]</label>
+#. <label asp-for="PhoneNumber" class="form-label">@T["Phone Number"]</label>
 #: OrchardCore.Users\Views\UserPhoneNumber.Edit.cshtml:4
 msgctxt "OrchardCore.Users.Views.UserPhoneNumber.Edit"
 msgid "Phone Number"
@@ -3350,7 +3422,7 @@ msgctxt "OrchardCore.Users.Views.UserSaveButtons.Edit"
 msgid "Cancel"
 msgstr "取消"
 
-#. <label asp-for="TimeZoneId">@T["Default Time Zone"]</label>
+#. <label asp-for="TimeZoneId" class="form-label">@T["Default Time Zone"]</label>
 #: OrchardCore.Users\Views\UserTimeZone.Edit.cshtml:5
 msgctxt "OrchardCore.Users.Views.UserTimeZone.Edit"
 msgid "Default Time Zone"
@@ -3416,7 +3488,7 @@ msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Please enter the code"
 msgstr ""
 
-#. <label asp-for="Code" class="control-label form-label">@T["Verification code"]</label>
+#. <label asp-for="Code" class="form-label form-label">@T["Verification code"]</label>
 #: OrchardCore.Users\Views\SmsAuthenticator\ValidateCode.cshtml:22
 msgctxt "OrchardCore.Users.Views.SmsAuthenticator.ValidateCode"
 msgid "Verification code"
@@ -3440,16 +3512,16 @@ msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Set the 'UserName' workflow property if the user is authenticated"
 msgstr ""
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:10
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
 msgid "Roles"
 msgstr "角色"
 
-#. <span class="hint">@T["The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."]</span>
+#. <span class="hint">@T["The 'InRole' outcome will be triggered if the user has at least one of the selected roles."]</span>
 #: OrchardCore.Users\Views\Items\ValidateUserTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Users.Views.Items.ValidateUserTask.Fields.Edit"
-msgid "The 'InRole' outcome will be triggerred if the user has at least one of the selected roles."
+msgid "The 'InRole' outcome will be triggered if the user has at least one of the selected roles."
 msgstr ""
 
 #. <h4 class="card-title"><i class="fa-solid fa-user" aria-hidden="true"></i>@T["Validate User"]</h4>
diff --git a/Localization/zh-Hant/OrchardCore.Widgets.po b/Localization/zh-Hant/OrchardCore.Widgets.po
index cf1be1198a68b..3c3417f02a01c 100644
--- a/Localization/zh-Hant/OrchardCore.Widgets.po
+++ b/Localization/zh-Hant/OrchardCore.Widgets.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-07-18 16:24\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" title="@T["Insert Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 #: OrchardCore.Widgets\Views\ContentCard-WidgetsListPart.Edit.cshtml:24
@@ -48,13 +48,13 @@ msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Edit"
 msgid "Add Widget"
 msgstr "添加部件"
 
-#. <option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+#. <option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
 #: OrchardCore.Widgets\Views\WidgetsListPart.Option.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsListPart.Option"
 msgid "Standard"
 msgstr ""
 
-#. <label asp-for="Zones">@T["Available widgets zones"]</label>
+#. <label asp-for="Zones" class="form-label">@T["Available widgets zones"]</label>
 #: OrchardCore.Widgets\Views\WidgetsPartSettings.Edit.cshtml:4
 msgctxt "OrchardCore.Widgets.Views.WidgetsPartSettings.Edit"
 msgid "Available widgets zones"
diff --git a/Localization/zh-Hant/OrchardCore.Workflows.po b/Localization/zh-Hant/OrchardCore.Workflows.po
index bc90453ba9a52..23457f5f3fa71 100644
--- a/Localization/zh-Hant/OrchardCore.Workflows.po
+++ b/Localization/zh-Hant/OrchardCore.Workflows.po
@@ -10,172 +10,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-17 17:53\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. public override LocalizedString DisplayText => S["Commit Transaction Task"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Commit Transaction Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Session"];
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:31
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:29
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Session"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Done"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Valid"
 msgstr ""
 
 #. return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:35
+#: OrchardCore.Workflows\Activities\CommitTransactionTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CommitTransactionTask"
 msgid "Invalid"
 msgstr ""
 
 #. public override LocalizedString DisplayText => S["Correlate Task"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Correlate Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:25
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\CorrelateTask.cs:35
+#: OrchardCore.Workflows\Activities\CorrelateTask.cs:33
 msgctxt "OrchardCore.Workflows.Activities.CorrelateTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["For Each Task"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:23
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "For Each Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:25
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Iterate"
 msgstr "迭 代"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForEachTask.cs:65
+#: OrchardCore.Workflows\Activities\ForEachTask.cs:64
 msgctxt "OrchardCore.Workflows.Activities.ForEachTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Fork Task"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:20
+#: OrchardCore.Workflows\Activities\ForkTask.cs:18
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Fork Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForkTask.cs:22
+#: OrchardCore.Workflows\Activities\ForkTask.cs:20
 msgctxt "OrchardCore.Workflows.Activities.ForkTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. public override LocalizedString DisplayText => S["For Loop Task"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:22
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "For Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Iterate"
 msgstr "迭 代"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\ForLoopTask.cs:74
+#: OrchardCore.Workflows\Activities\ForLoopTask.cs:73
 msgctxt "OrchardCore.Workflows.Activities.ForLoopTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["If Else Task"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:22
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "If Else Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:24
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "True"
 msgstr "正确的"
 
 #. return Outcomes(S["True"], S["False"]);
-#: OrchardCore.Workflows\Activities\IfElseTask.cs:37
+#: OrchardCore.Workflows\Activities\IfElseTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.IfElseTask"
 msgid "False"
 msgstr "错误的"
 
 #. public override LocalizedString DisplayText => S["Join Task"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:27
+#: OrchardCore.Workflows\Activities\JoinTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Join Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\JoinTask.cs:29
+#: OrchardCore.Workflows\Activities\JoinTask.cs:27
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Joined"]);
-#: OrchardCore.Workflows\Activities\JoinTask.cs:45
+#: OrchardCore.Workflows\Activities\JoinTask.cs:43
 msgctxt "OrchardCore.Workflows.Activities.JoinTask"
 msgid "Joined"
 msgstr "加入"
 
 #. public override LocalizedString DisplayText => S["Log Task"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:25
+#: OrchardCore.Workflows\Activities\LogTask.cs:24
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Log Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\LogTask.cs:27
+#: OrchardCore.Workflows\Activities\LogTask.cs:26
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\LogTask.cs:43
+#: OrchardCore.Workflows\Activities\LogTask.cs:42
 msgctxt "OrchardCore.Workflows.Activities.LogTask"
 msgid "Done"
 msgstr "完成"
@@ -193,91 +193,91 @@ msgid "Exceptions"
 msgstr "异常"
 
 #. public override LocalizedString DisplayText => S["Notify Task"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:32
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Notify Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["UI"];
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:36
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:34
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "UI"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\NotifyTask.cs:52
+#: OrchardCore.Workflows\Activities\NotifyTask.cs:50
 msgctxt "OrchardCore.Workflows.Activities.NotifyTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Script Task"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Script Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\ScriptTask.cs:27
+#: OrchardCore.Workflows\Activities\ScriptTask.cs:25
 msgctxt "OrchardCore.Workflows.Activities.ScriptTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. public override LocalizedString DisplayText => S["Set Output Task"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Set Output Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:25
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetOutputTask.cs:41
+#: OrchardCore.Workflows\Activities\SetOutputTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetOutputTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Set Property Task"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Set Property Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Primitives"];
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:25
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Primitives"
 msgstr "图元"
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:41
+#: OrchardCore.Workflows\Activities\SetPropertyTask.cs:39
 msgctxt "OrchardCore.Workflows.Activities.SetPropertyTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["While Loop Task"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:21
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "While Loop Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["Control Flow"];
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:25
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:23
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Control Flow"
 msgstr "控制流"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Iterate"
 msgstr "迭 代"
 
 #. return Outcomes(S["Iterate"], S["Done"]);
-#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:38
+#: OrchardCore.Workflows\Activities\WhileLoopTask.cs:36
 msgctxt "OrchardCore.Workflows.Activities.WhileLoopTask"
 msgid "Done"
 msgstr "完成"
@@ -301,13 +301,13 @@ msgid "Activity updated successfully."
 msgstr ""
 
 #. new SelectListItem() { Text = S["Recently created"], Value = nameof(WorkflowOrder.CreatedDesc) },
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:139
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Recently created"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:141
+#. new SelectListItem() { Text = S["Least recently created"], Value = nameof(WorkflowOrder.Created) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:140
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Least recently created"
 msgstr ""
@@ -324,82 +324,114 @@ msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Faulted"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) }
+#. new SelectListItem() { Text = S["Finished"], Value = nameof(WorkflowFilter.Finished) },
 #: OrchardCore.Workflows\Controllers\WorkflowController.cs:147
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Finished"
 msgstr ""
 
-#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:151
+#. new SelectListItem() { Text = S["Delete"], Value = nameof(WorkflowBulkAction.Delete) },
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:152
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:242
-#: OrchardCore.Workflows\Controllers\WorkflowController.cs:271
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:245
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:322
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
 msgid "Workflow {0} has been deleted."
 msgstr "工作流 {0} 已被删除。"
 
-#. new SelectListItem() { Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete) }
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:156
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#. await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:275
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:284
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Another instance is already running."
+msgstr ""
+
+#. await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+#: OrchardCore.Workflows\Controllers\WorkflowController.cs:290
+msgctxt "OrchardCore.Workflows.Controllers.WorkflowController"
+msgid "Workflow {0} has been restarted."
+msgstr ""
+
+#. Text = S["Delete"].Value, Value = nameof(WorkflowTypeBulkAction.Delete),
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:162
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Delete"
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:196
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:207
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} has been deleted."
 msgstr "工作流 {0} 已被删除。"
 
 #. await _notifier.SuccessAsync(H["Workflow has been saved."]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:463
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:491
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow has been saved."
 msgstr ""
 
 #. await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
-#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:484
+#: OrchardCore.Workflows\Controllers\WorkflowTypeController.cs:515
 msgctxt "OrchardCore.Workflows.Controllers.WorkflowTypeController"
 msgid "Workflow {0} deleted"
 msgstr ""
 
+#. public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:25
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Catch Workflow Fault Event"
+msgstr ""
+
+#. public override LocalizedString Category => S["Background"];
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:26
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Background"
+msgstr ""
+
+#. return Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Events\WorkflowFaultEvent.cs:36
+msgctxt "OrchardCore.Workflows.Events.WorkflowFaultEvent"
+msgid "Done"
+msgstr ""
+
 #. public override LocalizedString DisplayText => S["Http Redirect Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:31
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Http Redirect Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:35
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:33
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:51
+#: OrchardCore.Workflows\Http\Activities\HttpRedirectTask.cs:49
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRedirectTask"
 msgid "Done"
 msgstr "完成"
 
 #. public override LocalizedString DisplayText => S["Http Request Event"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:28
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Http Request Event"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:29
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:30
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "HTTP"
 msgstr ""
 
-#. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:66
+#. => Outcomes(S["Done"]);
+#: OrchardCore.Workflows\Http\Activities\HttpRequestEvent.cs:95
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestEvent"
 msgid "Done"
 msgstr "完成"
@@ -423,37 +455,37 @@ msgid "Matched"
 msgstr "匹配"
 
 #. public override LocalizedString DisplayText => S["Http Request Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:102
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Http Request Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:106
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:104
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "HTTP"
 msgstr ""
 
 #. outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:159
+#: OrchardCore.Workflows\Http\Activities\HttpRequestTask.cs:157
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpRequestTask"
 msgid "Unhandled Http Status"
 msgstr "未处理的 Http 状态"
 
 #. public override LocalizedString DisplayText => S["Http Response Task"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:36
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Http Response Task"
 msgstr ""
 
 #. public override LocalizedString Category => S["HTTP"];
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:40
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:38
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "HTTP"
 msgstr ""
 
 #. return Outcomes(S["Done"]);
-#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:68
+#: OrchardCore.Workflows\Http\Activities\HttpResponseTask.cs:66
 msgctxt "OrchardCore.Workflows.Http.Activities.HttpResponseTask"
 msgid "Done"
 msgstr "完成"
@@ -512,19 +544,19 @@ msgctxt "OrchardCore.Workflows.UserTasks.Drivers.UserTaskEventContentDriver"
 msgid "Not authorized to trigger '{0}'."
 msgstr ""
 
-#. <a class="btn btn-outline-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-secondary activity-start-action" href="#" data-bs-toggle="button" title="@T["Startup task"]"><i class="fa-solid fa-power-off" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:27
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Startup task"
 msgstr "启动任务"
 
-#. <a class="btn btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-primary activity-edit-action" asp-action="Edit" asp-controller="Activity" asp-route-workflowtypeid="@Model.WorkflowTypeId" asp-route-activityid="@activityRecord.ActivityId" asp-route-returnurl="@Model.ReturnUrl" data-persist-workflow="true" title="@T["Edit"]"><i class="fa-solid fa-pencil" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Edit"
 msgstr "编辑"
 
-#. <a class="btn btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
+#. <a class="btn btn-sm btn-danger activity-delete-action" href="#" title="@T["Delete"]"><i class="fa-solid fa-trash" aria-hidden="true"></i></a>
 #: OrchardCore.Workflows\Views\Activity.Design.cshtml:32
 msgctxt "OrchardCore.Workflows.Views.Activity.Design"
 msgid "Delete"
@@ -536,7 +568,7 @@ msgctxt "OrchardCore.Workflows.Views.Activity.Thumbnail"
 msgid "Add"
 msgstr "添加"
 
-#. <label asp-for="Title">@T["Title"]</label>
+#. <label asp-for="Title" class="form-label">@T["Title"]</label>
 #: OrchardCore.Workflows\Views\ActivityMetadata.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.ActivityMetadata.Edit"
 msgid "Title"
@@ -630,7 +662,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Design"
 msgid "Correlate"
 msgstr "关联"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\CorrelateTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.CorrelateTask.Fields.Edit"
 msgid "Value"
@@ -732,14 +764,28 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Back"
 msgstr "回上一頁"
 
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:99
+msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:94
+#: OrchardCore.Workflows\Views\Workflow\Details.cshtml:101
 msgctxt "OrchardCore.Workflows.Views.Workflow.Details"
 msgid "Delete"
 msgstr "删除"
@@ -762,7 +808,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:20
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Name"
@@ -822,7 +868,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:56
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock timeout (ms)"
@@ -834,7 +880,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\Duplicate.cshtml:62
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Duplicate"
 msgid "Lock expiration (ms)"
@@ -870,7 +916,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Events"
 msgstr "可用事件"
 
-#. @T["Add Event"]
+#. <i class="fa-solid fa-bolt"></i> @T["Add Event"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Event"
@@ -882,7 +928,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Available Tasks"
 msgstr "可用任务"
 
-#. @T["Add Task"]
+#. <i class="fa-solid fa-bars-progress"></i> @T["Add Task"]
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:22
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Add Task"
@@ -906,7 +952,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Are you sure you want to delete this activity?"
 msgstr "确实要删除此活动吗?"
 
-#. <button class="btn btn-primary save" type="submit">@T["Save"]</button>
+#. <button class="btn btn-success save" type="submit">@T["Save"]</button>
 #: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:51
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Save"
@@ -934,6 +980,12 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
 msgid "Filter"
 msgstr "过滤"
 
+#. <a class="nav-link active" href="#all" data-bs-toggle="pill">@T["All"]</a>
+#: OrchardCore.Workflows\Views\WorkflowType\Edit.cshtml:73
+msgctxt "OrchardCore.Workflows.Views.WorkflowType.Edit"
+msgid "All"
+msgstr ""
+
 #. <zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Model.Activity.DisplayText.Value])</h1></zone>
 #: OrchardCore.Workflows\Views\Activity\EditActivity.cshtml:4
 msgctxt "OrchardCore.Workflows.Views.Activity.EditActivity"
@@ -970,7 +1022,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Advanced"
 msgstr ""
 
-#. <label asp-for="Name">@T["Name"]</label>
+#. <label asp-for="Name" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:21
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Name"
@@ -1030,7 +1082,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Invalid lock expiration value in the advanced tab"
 msgstr ""
 
-#. <label asp-for="LockTimeout">@T["Lock timeout (ms)"]</label>
+#. <label asp-for="LockTimeout" class="form-label">@T["Lock timeout (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:57
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock timeout (ms)"
@@ -1042,7 +1094,7 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type atomically. Leave it to zero to not use any locking."
 msgstr ""
 
-#. <label asp-for="LockExpiration">@T["Lock expiration (ms)"]</label>
+#. <label asp-for="LockExpiration" class="form-label">@T["Lock expiration (ms)"]</label>
 #: OrchardCore.Workflows\Views\WorkflowType\EditProperties.cshtml:63
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.EditProperties"
 msgid "Lock expiration (ms)"
@@ -1078,7 +1130,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Design"
 msgid "Iterate <em>{0}</em> over <em>{1}</em>"
 msgstr ""
 
-#. <label asp-for="EnumerableExpression">@T["Enumerable Expression"]</label>
+#. <label asp-for="EnumerableExpression" class="form-label">@T["Enumerable Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Enumerable Expression"
@@ -1090,7 +1142,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "The list to iterate. With JavaScript support."
 msgstr "要迭代的列表。 有 JavaScript 的支持。"
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForEachTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForEachTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1132,7 +1184,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Design"
 msgid "No forks"
 msgstr "没有分支"
 
-#. <label asp-for="Forks">@T["Forks"]</label>
+#. <label asp-for="Forks" class="form-label">@T["Forks"]</label>
 #: OrchardCore.Workflows\Views\Items\ForkTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForkTask.Fields.Edit"
 msgid "Forks"
@@ -1168,7 +1220,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Design"
 msgid "Iterate <em>{0}</em> from <em>{1}</em> to <em>{2}</em>"
 msgstr "从<em> {1} </ em>到<em> {2} </ em>迭代<em> {0} </ em>"
 
-#. <label asp-for="FromExpression">@T["From Expression"]</label>
+#. <label asp-for="FromExpression" class="form-label">@T["From Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "From Expression"
@@ -1180,7 +1232,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The start value. With JavaScript support."
 msgstr "JavaScript支持的起始值。"
 
-#. <label asp-for="ToExpression">@T["To Expression"]</label>
+#. <label asp-for="ToExpression" class="form-label">@T["To Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "To Expression"
@@ -1192,7 +1244,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The end value. With JavaScript support."
 msgstr "最终价值。有JavaScript支持。"
 
-#. <label asp-for="StepExpression">@T["Step Expression"]</label>
+#. <label asp-for="StepExpression" class="form-label">@T["Step Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Step Expression"
@@ -1204,7 +1256,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "The loop Step value. With JavaScript support."
 msgstr "循环步骤值。支持 JavaScript。"
 
-#. <label asp-for="LoopVariableName">@T["Looping Variable"]</label>
+#. <label asp-for="LoopVariableName" class="form-label">@T["Looping Variable"]</label>
 #: OrchardCore.Workflows\Views\Items\ForLoopTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.ForLoopTask.Fields.Edit"
 msgid "Looping Variable"
@@ -1235,7 +1287,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Design"
 msgid "HTTP Redirect"
 msgstr "HTTP重定向"
 
-#. <label asp-for="Location">@T["Location"]</label>
+#. <label asp-for="Location" class="form-label">@T["Location"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Location"
@@ -1248,13 +1300,13 @@ msgid "The URL to redirect to. With Liquid support."
 msgstr "他重定向到的URL。有液体支持。"
 
 #. @T["Permanent"]
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:14
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:15
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Permanent"
 msgstr "永久的"
 
-#. <span class="hint">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:16
+#. <span class="hint dashed">@T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRedirectTask.Fields.Edit.cshtml:17
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRedirectTask.Fields.Edit"
 msgid "Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."
 msgstr "\n"
@@ -1278,7 +1330,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Design"
 msgid "Handle Incoming HTTP Request"
 msgstr "处理传入的HTTP请求"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:8
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1314,36 +1366,48 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Anyone that invokes this URL will trigger this workflow. Keep it in a safe place."
 msgstr "任何调用此 URL 的人都将触发此工作流。把它放在安全的地方。"
 
-#. <label asp-for="ValidateAntiforgeryToken">@T["Validate Antiforgery Token"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:29
+#. <label asp-for="ValidateAntiforgeryToken" class="form-check-label">@T["Validate Antiforgery Token"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Validate Antiforgery Token"
 msgstr "验证 Antiforgery 令牌"
 
 #. <span class="hint">@T["Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:30
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:31
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Uncheck this option if the request comes from a service that invokes this URL as a webhook. If this URL is requested from a form, then keep this option checked to ensure the form values have not been tampered with."
 msgstr "如果请求来自调用此 URL 作为 webhook 的服务, 请取消选中此选项。如果从表单请求此 URL, 请选中此选项以确保表单值未被篡改。"
 
-#. <label asp-for="TokenLifeSpan">@T["Token Life Span"]</label>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:35
+#. <label asp-for="TokenLifeSpan" class="form-label">@T["Token Life Span"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Token Life Span"
 msgstr "Token 生命周期"
 
 #. <span class="hint"><i class="fa-solid fa-exclamation-triangle" aria-hidden="true"></i> @T["Hit the <b>Regenerate</b> button after changing this value."]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:36
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Hit the <b>Regenerate</b> button after changing this value."
 msgstr "更改此值，点击 <b>重新生成</b> 按钮。"
 
 #. <span class="hint">@T["Number of days to expire the token. 0 for the token to never expire"]</span>
-#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:37
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:39
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
 msgid "Number of days to expire the token. 0 for the token to never expire"
 msgstr "令牌过期的天数。0表示令牌永不过期"
 
+#. <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:44
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "Form Location"
+msgstr ""
+
+#. <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+#: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Edit.cshtml:47
+msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Edit"
+msgid "This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."
+msgstr ""
+
 #. <h4 class="card-title"><i class="fa-solid fa-bolt" aria-hidden="true"></i>@T["HTTP Request"]</h4>
 #: OrchardCore.Workflows\Views\Items\HttpRequestEvent.Fields.Thumbnail.cshtml:1
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestEvent.Fields.Thumbnail"
@@ -1362,7 +1426,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Design"
 msgid "Filter Incoming HTTP Request"
 msgstr "筛选传入 HTTP 请求"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "HTTP Method"
@@ -1374,7 +1438,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The HTTP method to match."
 msgstr "要匹配的 HTTP 方法。"
 
-#. <label asp-for="ControllerName">@T["Controller"]</label>
+#. <label asp-for="ControllerName" class="form-label">@T["Controller"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Controller"
@@ -1386,7 +1450,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The controller name to match."
 msgstr "要匹配的控制器名称。"
 
-#. <label asp-for="ActionName">@T["Action"]</label>
+#. <label asp-for="ActionName" class="form-label">@T["Action"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:19
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Action"
@@ -1398,7 +1462,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "The action name to match."
 msgstr "要匹配的操作名称。"
 
-#. <label asp-for="AreaName">@T["Area"]</label>
+#. <label asp-for="AreaName" class="form-label">@T["Area"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestFilterEvent.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestFilterEvent.Fields.Edit"
 msgid "Area"
@@ -1434,7 +1498,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Design"
 msgid "<em>{0} {1}</em>"
 msgstr ""
 
-#. <label asp-for="Url">@T["URL"]</label>
+#. <label asp-for="Url" class="form-label">@T["URL"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "URL"
@@ -1446,7 +1510,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The URL to send the request to. Supports Liquid syntax."
 msgstr "要向其发送请求的 URL。支持流体语法。"
 
-#. <label asp-for="HttpMethod">@T["HTTP Method"]</label>
+#. <label asp-for="HttpMethod" class="form-label">@T["HTTP Method"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Method"
@@ -1458,7 +1522,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The HTTP Method. For example: GET, POST, PUT, PATCH, OPTIONS, HEAD, DELETE"
 msgstr "HTTP 方法。例如: 获取、张贴、放置、修补、选项、头、删除"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:25
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Content Type"
@@ -1470,7 +1534,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The content type of the request body."
 msgstr "请求正文的内容类型。"
 
-#. <label asp-for="Body">@T["Body"]</label>
+#. <label asp-for="Body" class="form-label">@T["Body"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:38
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Body"
@@ -1482,7 +1546,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "The body to send with POST, PUT and PATCH requests. With Liquid support."
 msgstr "用开机自检、放置和补丁请求发送的正文。流体支持。"
 
-#. <label asp-for="Headers">@T["Headers"]</label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:45
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Headers"
@@ -1494,7 +1558,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "Provide additional HTTP headers, one per line. For example: Authorization: Bearer 123ABC. With Liquid support."
 msgstr "提供附加的 HTTP 头, 每行一个。例如: 授权: 持票人123ABC。流体支持。"
 
-#. <label asp-for="HttpResponseCodes">@T["HTTP Response Codes"]</label>
+#. <label asp-for="HttpResponseCodes" class="form-label">@T["HTTP Response Codes"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpRequestTask.Fields.Edit.cshtml:52
 msgctxt "OrchardCore.Workflows.Views.Items.HttpRequestTask.Fields.Edit"
 msgid "HTTP Response Codes"
@@ -1524,7 +1588,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Design"
 msgid "HTTP Response"
 msgstr "HTTP 响应："
 
-#. <label asp-for="HttpStatusCode">@T["HTTP Status Code"]</label>
+#. <label asp-for="HttpStatusCode" class="form-label">@T["HTTP Status Code"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "HTTP Status Code"
@@ -1536,7 +1600,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The HTTP Status Code to send back. <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">Click here</a> for a complete list."
 msgstr "HTTP 状态代码要发送。 <a href=\"https://en.wikipedia.org/wiki/List_of_HTTP_status_codes\" target=\"_blank\">点击这里</a> 完成列表。"
 
-#. <label asp-for="ContentType">@T["Content Type"]</label>
+#. <label asp-for="ContentType" class="form-label">@T["Content Type"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content Type"
@@ -1548,7 +1612,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The content type of the response body."
 msgstr "回复主体的内容类型。"
 
-#. <label asp-for="Content">@T["Content"]</label>
+#. <label asp-for="Content" class="form-label">@T["Content"]</label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:26
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Content"
@@ -1560,7 +1624,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "The body to send back. With Liquid support."
 msgstr "要回复的主体。有 Liquid 支持。"
 
-#. <label asp-for="Headers">@T["Headers"] </label>
+#. <label asp-for="Headers" class="form-label">@T["Headers"] </label>
 #: OrchardCore.Workflows\Views\Items\HttpResponseTask.Fields.Edit.cshtml:33
 msgctxt "OrchardCore.Workflows.Views.Items.HttpResponseTask.Fields.Edit"
 msgid "Headers"
@@ -1596,7 +1660,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Design"
 msgid "Evaluate <em>{0}</em>"
 msgstr "评估 <em>{0}</em>"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\IfElseTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.IfElseTask.Fields.Edit"
 msgid "Condition Expression"
@@ -1706,40 +1770,54 @@ msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Sort"
 msgstr ""
 
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Restart"
+msgstr ""
+
+#. <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:98
+msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
+msgid "Are you sure you want to restart this workflow instance?"
+msgstr ""
+
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Are you sure you want to delete this workflow instance?"
 msgstr ""
 
 #. <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:95
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:100
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Delete"
 msgstr "删除"
 
 #. <span class="hint">@T["Created {0}", (object)(await DisplayAsync(await New.TimeSpan(Utc: entry.Workflow.CreatedUtc)))]</span>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:104
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:109
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Created {0}"
 msgstr "已创建 {0}"
 
 #. @T["<strong>Nothing here!</strong> There are no halted workflows at the moment."]
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:119
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:124
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "<strong>Nothing here!</strong> There are no halted workflows at the moment."
 msgstr "<strong>这里什么都没有!</strong> 目前没有停止的工作流。"
 
 #. <a class="btn btn-secondary" href="@Model.ReturnUrl">@T["Back"]</a>
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:129
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:134
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "Back"
 msgstr "回上一頁"
 
 #. selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
 #. selectedItems.text(selectedItemsCount + ' @T["selected"]');
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:182
-#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:193
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:187
+#: OrchardCore.Workflows\Views\Workflow\Index.cshtml:198
 msgctxt "OrchardCore.Workflows.Views.Workflow.Index"
 msgid "selected"
 msgstr ""
@@ -1836,12 +1914,11 @@ msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
 msgid "Disabled"
 msgstr ""
 
-#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T.Plural(entry.WorkflowCount, "1 instance", "{0} instances")</a>
+#. <a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@entry.WorkflowType.Id" class="badge ta-badge"><i class="fa-solid fa-list-ol" aria-hidden="true"></i> @T["Instances"]</a>
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:83
 msgctxt "OrchardCore.Workflows.Views.WorkflowType.Index"
-msgid "1 instance"
-msgid_plural "{0} instances"
-msgstr[0] "1 实例"
+msgid "Instances"
+msgstr ""
 
 #. @T["<strong>Nothing here!</strong> There are no workflows for the moment."]
 #: OrchardCore.Workflows\Views\WorkflowType\Index.cshtml:96
@@ -1875,7 +1952,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Design"
 msgid "Awaits <strong>any</strong> inbound activities before joining execution into a single path."
 msgstr "在将执行加入到单个路径之前等待 <strong>任何</strong> 入站活动。"
 
-#. <label asp-for="Mode">@T["Mode"]</label>
+#. <label asp-for="Mode" class="form-label">@T["Mode"]</label>
 #: OrchardCore.Workflows\Views\Items\JoinTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.JoinTask.Fields.Edit"
 msgid "Mode"
@@ -1905,7 +1982,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Design"
 msgid "Log"
 msgstr "日志"
 
-#. <label asp-for="LogLevel">@T["Log Level"]</label>
+#. <label asp-for="LogLevel" class="form-label">@T["Log Level"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Log Level"
@@ -1917,7 +1994,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "The log level."
 msgstr "日记等级"
 
-#. <label asp-for="Text">@T["Text"]</label>
+#. <label asp-for="Text" class="form-label">@T["Text"]</label>
 #: OrchardCore.Workflows\Views\Items\LogTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.LogTask.Fields.Edit"
 msgid "Text"
@@ -1966,7 +2043,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Design"
 msgid "{0} Notification"
 msgstr "{0}通知"
 
-#. <label asp-for="NotificationType">@T["Notification Type"]</label>
+#. <label asp-for="NotificationType" class="form-label">@T["Notification Type"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:6
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Notification Type"
@@ -1978,7 +2055,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "The notification type."
 msgstr "通知类型。"
 
-#. <label asp-for="Message">@T["Message"]</label>
+#. <label asp-for="Message" class="form-label">@T["Message"]</label>
 #: OrchardCore.Workflows\Views\Items\NotifyTask.Fields.Edit.cshtml:13
 msgctxt "OrchardCore.Workflows.Views.Items.NotifyTask.Fields.Edit"
 msgid "Message"
@@ -2008,7 +2085,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Design"
 msgid "Script"
 msgstr "脚本"
 
-#. <label asp-for="AvailableOutcomes">@T["Available Outcomes"]</label>
+#. <label asp-for="AvailableOutcomes" class="form-label">@T["Available Outcomes"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Available Outcomes"
@@ -2020,7 +2097,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "A comma-separated list of available outcomes."
 msgstr "可用结果的逗号分隔列表。"
 
-#. <label asp-for="Script">@T["Script"]</label>
+#. <label asp-for="Script" class="form-label">@T["Script"]</label>
 #: OrchardCore.Workflows\Views\Items\ScriptTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.ScriptTask.Fields.Edit"
 msgid "Script"
@@ -2050,7 +2127,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Design"
 msgid "Output via {0}"
 msgstr "通过{0}输出"
 
-#. <label asp-for="OutputName">@T["Name"]</label>
+#. <label asp-for="OutputName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Name"
@@ -2062,7 +2139,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "The name to output to."
 msgstr "要输出的名称。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetOutputTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetOutputTask.Fields.Edit"
 msgid "Value"
@@ -2092,7 +2169,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Design"
 msgid "Set {0} Property"
 msgstr "设置{0}属性"
 
-#. <label asp-for="PropertyName">@T["Name"]</label>
+#. <label asp-for="PropertyName" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Name"
@@ -2104,7 +2181,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "The property to set. If the specified property doesn't exist yet, it will be added."
 msgstr "要设置的属性。如果指定的属性尚不存在，则会添加该属性。"
 
-#. <label asp-for="Value">@T["Value"]</label>
+#. <label asp-for="Value" class="form-label">@T["Value"]</label>
 #: OrchardCore.Workflows\Views\Items\SetPropertyTask.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.SetPropertyTask.Fields.Edit"
 msgid "Value"
@@ -2141,7 +2218,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Design"
 msgid "When <em>{0}</em> is triggered"
 msgstr "当<em> {0} </ em>被触发时"
 
-#. <label asp-for="SignalNameExpression">@T["Name"]</label>
+#. <label asp-for="SignalNameExpression" class="form-label">@T["Name"]</label>
 #: OrchardCore.Workflows\Views\Items\SignalEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.SignalEvent.Fields.Edit"
 msgid "Name"
@@ -2178,7 +2255,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Design"
 msgid "<em>{0}</em>"
 msgstr ""
 
-#. <label asp-for="CronExpression">@T["CRON Expression"]</label>
+#. <label asp-for="CronExpression" class="form-label">@T["CRON Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\TimerEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.TimerEvent.Fields.Edit"
 msgid "CRON Expression"
@@ -2232,7 +2309,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Design"
 msgid "No user actions specified"
 msgstr "未指定用户操作"
 
-#. <label asp-for="Actions">@T["Actions"]</label>
+#. <label asp-for="Actions" class="form-label">@T["Actions"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Actions"
@@ -2244,7 +2321,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Enter one or more comma-separated action names."
 msgstr "输入一个或多个逗号分隔的操作名称。"
 
-#. <label asp-for="Roles">@T["Roles"]</label>
+#. <label asp-for="Roles" class="form-label">@T["Roles"]</label>
 #: OrchardCore.Workflows\Views\Items\UserTaskEvent.Fields.Edit.cshtml:12
 msgctxt "OrchardCore.Workflows.Views.Items.UserTaskEvent.Fields.Edit"
 msgid "Roles"
@@ -2280,7 +2357,7 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Design"
 msgid "Loop while <em>{0}</em> is true"
 msgstr "循环 <em>{0}</em> 为 true"
 
-#. <label asp-for="ConditionExpression">@T["Condition Expression"]</label>
+#. <label asp-for="ConditionExpression" class="form-label">@T["Condition Expression"]</label>
 #: OrchardCore.Workflows\Views\Items\WhileLoopTask.Fields.Edit.cshtml:5
 msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Edit"
 msgid "Condition Expression"
@@ -2304,3 +2381,93 @@ msgctxt "OrchardCore.Workflows.Views.Items.WhileLoopTask.Fields.Thumbnail"
 msgid "Iterate while a condition is true."
 msgstr "在条件为 true 时迭代。"
 
+#. <h4><i class="fa fa-exclamation-circle"></i>@Model.Activity.GetTitleOrDefault(() => T["Workflow Fault Event"])</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Design.cshtml:7
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Design"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <label asp-for="ErrorFilter" class="form-label">@T["Trigger Condition"]</label>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:5
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Trigger Condition"
+msgstr ""
+
+#. <span class="hint">@T["Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."]</span><br />
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:9
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "Check the captured workflow error information and return a Boolean value. If it is true, it will be processed by the current workflow. Javascript syntax."
+msgstr ""
+
+#. @T["You can use input('{0}') to get error information, contains the following attributes：", WorkflowFaultModel.WorkflowFaultInputKey]
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:11
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "You can use input('{0}') to get error information, contains the following attributes："
+msgstr ""
+
+#. <li>@T["{0}：Workflow Id.", nameof(WorkflowFaultModel.WorkflowId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:15
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow Id."
+msgstr ""
+
+#. <li>@T["{0}：Workflow name.", nameof(WorkflowFaultModel.WorkflowName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:16
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Workflow name."
+msgstr ""
+
+#. <li>@T["{0}：Executed activity count.", nameof(WorkflowFaultModel.ExecutedActivityCount)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:17
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Executed activity count."
+msgstr ""
+
+#. <li>@T["{0}：The name of the activity.", nameof(WorkflowFaultModel.ActivityDisplayName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:18
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：The name of the activity."
+msgstr ""
+
+#. <li>@T["{0}：Activity Type Name.", nameof(WorkflowFaultModel.ActivityTypeName)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:19
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Type Name."
+msgstr ""
+
+#. <li>@T["{0}：Activity Id.", nameof(WorkflowFaultModel.ActivityId)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:20
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Activity Id."
+msgstr ""
+
+#. <li>@T["{0}：Exception Information Summary.", nameof(WorkflowFaultModel.ErrorMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:21
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Information Summary."
+msgstr ""
+
+#. <li>@T["{0}：Exception Details.", nameof(WorkflowFaultModel.ExceptionDetails)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:22
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Exception Details."
+msgstr ""
+
+#. <li>@T["{0}：Contains error messages manually raised by workflow activity.", nameof(WorkflowFaultModel.FaultMessage)]</li>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Edit.cshtml:23
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Edit"
+msgid "{0}：Contains error messages manually raised by workflow activity."
+msgstr ""
+
+#. <h4 class="card-title"><i class="fa fa-exclamation-circle"></i>@T["Workflow Fault Event"]</h4>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:1
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Workflow Fault Event"
+msgstr ""
+
+#. <p>@T["Trigger and capture exception information when exception occurs in any other workflow."]</p>
+#: OrchardCore.Workflows\Views\Items\WorkflowFaultEvent.Fields.Thumbnail.cshtml:2
+msgctxt "OrchardCore.Workflows.Views.Items.WorkflowFaultEvent.Fields.Thumbnail"
+msgid "Trigger and capture exception information when exception occurs in any other workflow."
+msgstr ""
+
diff --git a/Localization/zh-Hant/TheAdmin.po b/Localization/zh-Hant/TheAdmin.po
index 77a8a00480738..74e3f32f61882 100644
--- a/Localization/zh-Hant/TheAdmin.po
+++ b/Localization/zh-Hant/TheAdmin.po
@@ -10,58 +10,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Light mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:63
-msgctxt "TheAdmin.Views.Layout"
-msgid "Light mode"
-msgstr ""
-
-#. <a id="btn-darkmode" class="nav-link" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
-#. <span class="d-none">@T["Dark mode"]</span>
-#: TheAdmin\Views\Layout.cshtml:59
-#: TheAdmin\Views\Layout.cshtml:68
-msgctxt "TheAdmin.Views.Layout"
-msgid "Dark mode"
-msgstr ""
-
-#. <a href="@Url.Content("~/")" class="nav-link" target="_blank" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@T["Visit Site"]" role="button">
-#: TheAdmin\Views\Layout.cshtml:74
-msgctxt "TheAdmin.Views.Layout"
-msgid "Visit Site"
-msgstr ""
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
 #. <span class="d-none">@T["Collapse / expand menu"]</span>
-#: TheAdmin\Views\Layout.cshtml:89
-#: TheAdmin\Views\Layout.cshtml:90
+#: TheAdmin\Views\Layout.cshtml:72
+#: TheAdmin\Views\Layout.cshtml:73
 msgctxt "TheAdmin.Views.Layout"
 msgid "Collapse / expand menu"
 msgstr "隱藏 / 顯示選單"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Delete"
 msgstr "刪除"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Are you sure you want to remove this element?"
 msgstr "您是否確定要刪除此項目？"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Ok"
 msgstr "確定"
 
 #. <div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
-#: TheAdmin\Views\Layout.cshtml:109
+#: TheAdmin\Views\Layout.cshtml:92
 msgctxt "TheAdmin.Views.Layout"
 msgid "Cancel"
 msgstr "取消"
@@ -98,3 +76,29 @@ msgctxt "TheAdmin.Views.Pager"
 msgid "Listing pages"
 msgstr ""
 
+#. <button class="btn btn-link nav-link dropdown-toggle" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:3
+#: TheAdmin\Views\ToggleTheme.cshtml:5
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:13
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:21
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheAdmin\Views\ToggleTheme.cshtml:29
+msgctxt "TheAdmin.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
diff --git a/Localization/zh-Hant/TheAgencyTheme.po b/Localization/zh-Hant/TheAgencyTheme.po
index 014f3c36e408c..34bdae942ffa0 100644
--- a/Localization/zh-Hant/TheAgencyTheme.po
+++ b/Localization/zh-Hant/TheAgencyTheme.po
@@ -10,7 +10,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
+#: TheAgencyTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheAgencyTheme.Views.HttpError-NotFound"
+msgid "The page you requested could not be found."
+msgstr ""
 
 #: TheAgencyTheme\Views\SearchForm.liquid:0
 msgctxt "TheAgencyTheme.Views.SearchForm"
@@ -27,16 +37,6 @@ msgctxt "TheAgencyTheme.Views.SearchResults"
 msgid "There are no such results."
 msgstr ""
 
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr ""
-
-#: TheAgencyTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheAgencyTheme.Views.Shared.NotFound"
-msgid "The page you requested could not be found."
-msgstr ""
-
 #: TheAgencyTheme\Views\Shared\Search.liquid:0
 msgctxt "TheAgencyTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/zh-Hant/TheBlogTheme.po b/Localization/zh-Hant/TheBlogTheme.po
index 4d23436199930..62c42d70dd78d 100644
--- a/Localization/zh-Hant/TheBlogTheme.po
+++ b/Localization/zh-Hant/TheBlogTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-02-18 20:35\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #: TheBlogTheme\Views\Blog-ListPart.liquid:0
 msgctxt "TheBlogTheme.Views.Blog-ListPart"
@@ -82,6 +82,11 @@ msgctxt "TheBlogTheme.Views.Content-BlogPost.Summary"
 msgid "on {0}"
 msgstr "在 {0} 上"
 
+#: TheBlogTheme\Views\HttpError-NotFound.liquid:0
+msgctxt "TheBlogTheme.Views.HttpError-NotFound"
+msgid "Page Not Found"
+msgstr ""
+
 #: TheBlogTheme\Views\Search-Form.liquid:0
 msgctxt "TheBlogTheme.Views.Search-Form"
 msgid "Enter your search term(s)"
@@ -97,11 +102,6 @@ msgctxt "TheBlogTheme.Views.Search-Results"
 msgid "There are no such results."
 msgstr ""
 
-#: TheBlogTheme\Views\Shared\NotFound.liquid:0
-msgctxt "TheBlogTheme.Views.Shared.NotFound"
-msgid "Page Not Found"
-msgstr "无法找到页面"
-
 #: TheBlogTheme\Views\Shared\Search.liquid:0
 msgctxt "TheBlogTheme.Views.Shared.Search"
 msgid "Search"
diff --git a/Localization/zh-Hant/TheTheme.po b/Localization/zh-Hant/TheTheme.po
index 1a4063b415ea9..e30b33a77af75 100644
--- a/Localization/zh-Hant/TheTheme.po
+++ b/Localization/zh-Hant/TheTheme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
-"PO-Revision-Date: 2023-08-31 19:42\n"
+"PO-Revision-Date: 2023-12-22 16:30\n"
 
 #. <h4>@T["Welcome to Orchard Core, your site has been successfully set up."]</h4>
 #: TheTheme\Views\Home\Index.cshtml:2
@@ -18,3 +18,52 @@ msgctxt "TheTheme.Views.Home.Index"
 msgid "Welcome to Orchard Core, your site has been successfully set up."
 msgstr ""
 
+#. <a role="button" class="nav-link dropdown-toggle" id="bd-theme" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="@T["Toggle theme"]">
+#. <span class="d-none" id="bd-theme-text">@T["Toggle theme"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:2
+#: TheTheme\Views\ToggleTheme.cshtml:4
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Toggle theme"
+msgstr ""
+
+#. <span class="ps-2">@T["Auto"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:12
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Auto"
+msgstr ""
+
+#. <span class="ps-2">@T["Light"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:20
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Light"
+msgstr ""
+
+#. <span class="ps-2">@T["Dark"]</span>
+#: TheTheme\Views\ToggleTheme.cshtml:28
+msgctxt "TheTheme.Views.ToggleTheme"
+msgid "Dark"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have more than {0} unread notifications"
+msgstr ""
+
+#: TheTheme\Views\UserNotificationNavbar.cshtml:0
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have {1} unread notification"
+msgid_plural "You have {0} unread notifications"
+msgstr[0] ""
+
+#. <i class="fa-regular fa-bell" aria-hidden="true" data-bs-toggle="tooltip" data-bs-original-title="@T["You have no unread notifications"]"></i>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:31
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "You have no unread notifications"
+msgstr ""
+
+#. <a class="dropdown-item fw-bold" asp-action="List" asp-controller="Admin" asp-area="OrchardCore.Notifications">@T["Notification Center"]</a>
+#: TheTheme\Views\UserNotificationNavbar.cshtml:54
+msgctxt "TheTheme.Views.UserNotificationNavbar"
+msgid "Notification Center"
+msgstr ""
+